Skip to content

Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS

fix: retain remote-only inventory visibility after local completion

[._.]/ Adam Eivy9d9f4032633d
diff --git a/client/src/components/cos/tabs/schedule/BranchReconcileOutcome.jsx b/client/src/components/cos/tabs/schedule/BranchReconcileOutcome.jsx
index e0a7ad8521..1ee994f090 100644
--- a/client/src/components/cos/tabs/schedule/BranchReconcileOutcome.jsx
+++ b/client/src/components/cos/tabs/schedule/BranchReconcileOutcome.jsx
@@ -110,6 +110,17 @@ export default function BranchReconcileOutcome({ outcomes, apps }) {
<p>{outcome.observedAt ? `Last inventory: ${formatDateTime(outcome.observedAt)}` : 'No readable inventory yet.'}</p>
{outcome.reason && <p className="break-words">Reason: {outcome.reason}</p>}
{outcome.nextAction && <p>{outcome.nextAction}</p>}
+ {outcome.remoteInventory?.reported?.length > 0 && (
+ <details>
+ <summary className="cursor-pointer">Remote-only inventory · {formatCount(outcome.remoteInventory.reported.length)} informational</summary>
+ <p>Local cleanup status covers this machine’s branches and checkouts. Remote-only refs may belong to another instance.</p>
+ <ul className="max-h-48 overflow-y-auto">
+ {outcome.remoteInventory.reported.map((entry, index) => <li key={index} className="break-all">
+ {typeof entry === 'string' ? entry : `${entry.branch}: ${entry.reason}`}
+ </li>)}
+ </ul>
+ </details>
+ )}
{!remaining && <p>Remaining work is unknown.</p>}
<ul className="space-y-2 max-h-64 overflow-y-auto">
{(remaining || []).map((entry, index) => (
diff --git a/client/src/components/cos/tabs/schedule/BranchReconcileOutcome.test.jsx b/client/src/components/cos/tabs/schedule/BranchReconcileOutcome.test.jsx
index fb4012451f..2c6012727e 100644
--- a/client/src/components/cos/tabs/schedule/BranchReconcileOutcome.test.jsx
+++ b/client/src/components/cos/tabs/schedule/BranchReconcileOutcome.test.jsx
@@ -23,6 +23,17 @@ function open() {
describe('BranchReconcileOutcome checkout retirement', () => {
beforeEach(() => { retire.mockReset(); prepare.mockReset(); });
+ it('shows peer remote inventory separately from drained local work without offering retirement', () => {
+ render(<BranchReconcileOutcome outcomes={{ 'app-1': { status: 'drained', remaining: [], remoteInventory: {
+ reported: [{ branch: 'feature/peer-only', reason: 'unmerged-remote-only' }],
+ } } }} apps={[{ id: 'app-1', name: 'Example App' }]} />);
+ expect(screen.getByText(/Example App · No remaining work in last scan · 0 remaining/)).toBeInTheDocument();
+ expect(screen.getByText('Remote-only inventory · 1 informational')).toBeInTheDocument();
+ expect(screen.getByText('feature/peer-only: unmerged-remote-only')).toBeInTheDocument();
+ expect(screen.queryByRole('button', { name: /Archive and retire/ })).toBeNull();
+ expect(retire).not.toHaveBeenCalled();
+ });
+
it('sends the exact inventory row as the scoped release and hides the row until a fresh inventory arrives', async () => {
retire.mockResolvedValue({ ok: true, archiveDir: '/example/archive', branchDeleted: true });
const { rerender } = open();
diff --git a/server/services/branchReconcile.localCompletion.test.js b/server/services/branchReconcile.localCompletion.test.js
index 5840494339..320b6c286f 100644
--- a/server/services/branchReconcile.localCompletion.test.js
+++ b/server/services/branchReconcile.localCompletion.test.js
@@ -56,6 +56,9 @@ describe.skipIf(SKIP_HEAVY_INTEGRATION)('machine-local reconciliation completion
it('persists a drained local outcome with visible peer-only inventory, but retains a real local checkout hold', async () => {
const remoteBefore = (await execGit(['ls-remote', '--heads', 'origin'], local)).stdout;
const peerBefore = (await execGit(['rev-parse', 'HEAD'], peer)).stdout;
+ // Upgrade the prior reporting format only after a fresh local/remote scan.
+ await schedule.recordBranchReconcileOutcome(app.id, { status: 'incomplete',
+ remaining: [{ branch: 'feature/peer-only', reason: 'remote-branch-held' }] });
expect(await run()).toEqual({ skip: true });
expect(await outcome()).toMatchObject({
status: 'drained', remaining: [], nextAction: null,