oh-my-codex 0.21.26 → 0.21.28

package/dist/subagents/__tests__/tracker.test.js

@@ -179,7 +179,7 @@ describe('subagents/tracker', () => {
                             nested: { thread_id: 'nested', kind: 'subagent', provenance_kind: NATIVE_SUBAGENT_PROVENANCE, direct_child_root_id: 'root', direct_child_parent_id: 'direct', status: 'available', first_seen_at: '2026-07-23T00:00:00.000Z', last_seen_at: '2026-07-23T00:00:00.000Z', turn_count: 1 },
                             revoked: { thread_id: 'revoked', kind: 'subagent', provenance_kind: NATIVE_SUBAGENT_PROVENANCE, direct_child_root_id: 'root', direct_child_parent_id: 'root', reopen_authority_revoked: true, status: 'available', first_seen_at: '2026-07-23T00:00:00.000Z', last_seen_at: '2026-07-23T00:00:00.000Z', turn_count: 1 },
                         } } } }));
-            const context = consumeDirectChildReopenContext(cwd, { sessionId: 'root', rootNativeSessionId: 'root', source: 'resume' }) ?? '';
+            const context = consumeDirectChildReopenContext(cwd, { sessionId: 'root', rootNativeSessionId: 'root', source: 'resume', availableTools: ['resume_agent'] }) ?? '';
             assert.match(context, /resume_agent\("direct"\)/);
             assert.doesNotMatch(context, /resume_agent\("root"\)|resume_agent\("nested"\)|resume_agent\("revoked"\)/);
             const persisted = JSON.parse(readFileSync(path, 'utf8'));
@@ -204,7 +204,7 @@ describe('subagents/tracker', () => {
             const repaired = JSON.parse(readFileSync(subagentTrackingPath(cwd), 'utf8'));
             assert.equal(repaired.sessions.canonical.threads.child.reopen_authority_revoked, undefined);
             assert.equal(repaired.sessions['root-a'].threads.child.reopen_authority_revoked, undefined);
-            assert.match(consumeDirectChildReopenContext(cwd, { sessionId: 'canonical', rootNativeSessionId: 'root-a', source: 'resume' }) ?? '', /resume_agent\("child"\)/);
+            assert.match(consumeDirectChildReopenContext(cwd, { sessionId: 'canonical', rootNativeSessionId: 'root-a', source: 'resume', availableTools: ['resume_agent'] }) ?? '', /resume_agent\("child"\)/);
         }
         finally {
             rmSync(cwd, { recursive: true, force: true });
@@ -312,7 +312,7 @@ describe('subagents/tracker', () => {
             recordNativeSubagentAuthorityObservation(cwd, { sessionIds: ['canonical', 'root'], childThreadId: 'child', parentThreadId: 'root' });
             const state = JSON.parse(readFileSync(subagentTrackingPath(cwd), 'utf8'));
             assert.equal(state.sessions.canonical.threads.child.reopen_authority_revoked, undefined);
-            assert.match(consumeDirectChildReopenContext(cwd, { sessionId: 'canonical', rootNativeSessionId: 'root', source: 'resume' }) ?? '', /resume_agent\("child"\)/);
+            assert.match(consumeDirectChildReopenContext(cwd, { sessionId: 'canonical', rootNativeSessionId: 'root', source: 'resume', availableTools: ['resume_agent'] }) ?? '', /resume_agent\("child"\)/);
         }
         finally {
             rmSync(cwd, { recursive: true, force: true });
@@ -341,7 +341,7 @@ describe('subagents/tracker', () => {
                             legacy: { thread_id: 'legacy', kind: 'subagent', provenance_kind: 'adapted', status: 'available', first_seen_at: '2026-07-23T00:00:00.000Z', last_seen_at: '2026-07-23T00:00:00.000Z', turn_count: 1 },
                         } } } }));
             recordNativeSubagentAuthorityObservation(cwd, { sessionIds: ['canonical', 'root'], childThreadId: 'child', parentThreadId: 'root', rootNativeSessionId: 'root', authorityEvidence: 'valid' });
-            const context = consumeDirectChildReopenContext(cwd, { sessionId: 'canonical', rootNativeSessionId: 'root', source: 'resume' }) ?? '';
+            const context = consumeDirectChildReopenContext(cwd, { sessionId: 'canonical', rootNativeSessionId: 'root', source: 'resume', availableTools: ['resume_agent'] }) ?? '';
             assert.match(context, /resume_agent\("child"\)/);
             assert.doesNotMatch(context, /resume_agent\("legacy"\)/);
         }
@@ -360,7 +360,7 @@ describe('subagents/tracker', () => {
                         } },
                 } }));
             recordNativeSubagentAuthorityObservation(cwd, { sessionIds: ['canonical', 'root'], childThreadId: 'child', parentThreadId: 'root', rootNativeSessionId: 'root', authorityEvidence: 'valid' });
-            const context = consumeDirectChildReopenContext(cwd, { sessionId: 'canonical', rootNativeSessionId: 'root', source: 'resume' }) ?? '';
+            const context = consumeDirectChildReopenContext(cwd, { sessionId: 'canonical', rootNativeSessionId: 'root', source: 'resume', availableTools: ['resume_agent'] }) ?? '';
             assert.match(context, /resume_agent\("child"\)/);
             const persisted = JSON.parse(readFileSync(path, 'utf8'));
             assert.equal(persisted.sessions.correlation.threads.child.provenance_kind, DESCRIPTIVE_ADAPTED_PROVENANCE);
@@ -528,7 +528,7 @@ describe('subagents/tracker', () => {
             const snapshot = await readSubagentTrackingState(cwd);
             const descriptive = recordSubagentTurn(snapshot, { sessionId: 'canonical', threadId: 'child', kind: 'subagent' });
             await writeSubagentTrackingState(cwd, descriptive);
-            assert.match(consumeDirectChildReopenContext(cwd, { sessionId: 'canonical', rootNativeSessionId: 'root', source: 'resume' }) ?? '', /resume_agent\("child"\)/);
+            assert.match(consumeDirectChildReopenContext(cwd, { sessionId: 'canonical', rootNativeSessionId: 'root', source: 'resume', availableTools: ['resume_agent'] }) ?? '', /resume_agent\("child"\)/);
         }
         finally {
             rmSync(cwd, { recursive: true, force: true });
@@ -584,7 +584,7 @@ describe('subagents/tracker', () => {
         const cwd = mkdtempSync(join(tmpdir(), 'omx-3284-tracker-authority-fence-'));
         try {
             recordNativeSubagentAuthorityObservation(cwd, { sessionIds: ['canonical', 'root'], childThreadId: 'child', parentThreadId: 'root', rootNativeSessionId: 'root', authorityEvidence: 'valid' });
-            assert.match(consumeDirectChildReopenContext(cwd, { sessionId: 'canonical', rootNativeSessionId: 'root', source: 'resume' }) ?? '', /resume_agent\("child"\)/);
+            assert.match(consumeDirectChildReopenContext(cwd, { sessionId: 'canonical', rootNativeSessionId: 'root', source: 'resume', availableTools: ['resume_agent'] }) ?? '', /resume_agent\("child"\)/);
             // Simulate a revocation whose transaction failed: the tracker still shows
             // valid authority, but the fence records the unpublished denial.
             fenceNativeSubagentAuthorities(cwd, ['child'], 'identity_untrusted_revocation_failed');
@@ -675,7 +675,7 @@ describe('subagents/tracker', () => {
         const cwd = mkdtempSync(join(tmpdir(), 'omx-3284-tracker-global-denial-'));
         try {
             recordNativeSubagentAuthorityObservation(cwd, { sessionIds: ['canonical', 'root'], childThreadId: 'child', parentThreadId: 'root', rootNativeSessionId: 'root', authorityEvidence: 'valid' });
-            assert.match(consumeDirectChildReopenContext(cwd, { sessionId: 'canonical', rootNativeSessionId: 'root', source: 'resume' }) ?? '', /resume_agent\("child"\)/);
+            assert.match(consumeDirectChildReopenContext(cwd, { sessionId: 'canonical', rootNativeSessionId: 'root', source: 'resume', availableTools: ['resume_agent'] }) ?? '', /resume_agent\("child"\)/);
             // Simulates both the tracker revocation AND the locked fence failing.
             assert.equal(forceGlobalAuthorityDenial(cwd, 'identity_untrusted_denial_escalated'), true);
             assert.match(consumeDirectChildReopenContext(cwd, { sessionId: 'canonical', rootNativeSessionId: 'root', source: 'resume' }) ?? '', /unreadable_authority_fence/);
@@ -840,6 +840,102 @@ describe('subagents/tracker', () => {
             rmSync(cwd, { recursive: true, force: true });
         }
     });
+    it('covers hosts without resume_agent in SessionStart reopen guidance', () => {
+        const cwd = mkdtempSync(join(tmpdir(), 'omx-3866-tracker-no-resume-tool-'));
+        try {
+            const path = subagentTrackingPath(cwd);
+            mkdirSync(join(cwd, '.omx', 'state'), { recursive: true });
+            writeFileSync(path, JSON.stringify({ schemaVersion: 1, sessions: { root: { session_id: 'root', updated_at: '2026-07-23T00:00:00.000Z', threads: {
+                            child: { thread_id: 'child', kind: 'subagent', provenance_kind: NATIVE_SUBAGENT_PROVENANCE, direct_child_root_id: 'root', direct_child_parent_id: 'root', status: 'available', first_seen_at: '2026-07-23T00:00:00.000Z', last_seen_at: '2026-07-23T00:00:00.000Z', turn_count: 1 },
+                        } } } }));
+            // With partial availableTools not including resume_agent, availability is unknown:
+            // guidance lists targets and explicitly checks availability before requiring invocation (issue #3866)
+            const contextUnknown = consumeDirectChildReopenContext(cwd, { sessionId: 'root', rootNativeSessionId: 'root', source: 'resume', availableTools: ['Read', 'Edit'] }) ?? '';
+            assert.match(contextUnknown, /Unknown: resume_agent tool availability could not be determined/);
+            assert.match(contextUnknown, /"child"/);
+            assert.match(contextUnknown, /If resume_agent is callable, use resume_agent\(<id>\)/);
+            assert.match(contextUnknown, /If resume_agent is not callable, continue in the root/);
+            // Without availableTools provided, availability is also unknown (no inventory to check)
+            const contextNoInventory = consumeDirectChildReopenContext(cwd, { sessionId: 'root', rootNativeSessionId: 'root', source: 'resume' }) ?? '';
+            assert.match(contextNoInventory, /Unknown: resume_agent tool availability could not be determined/);
+            assert.match(contextNoInventory, /"child"/);
+            // With resume_agent explicitly in availableTools, guidance instructs the call
+            const contextWithTool = consumeDirectChildReopenContext(cwd, { sessionId: 'root', rootNativeSessionId: 'root', source: 'resume', availableTools: ['read', 'resume_agent', 'edit'] }) ?? '';
+            assert.match(contextWithTool, /Reopen these persisted subagents/);
+            assert.match(contextWithTool, /resume_agent\("child"\)/);
+            assert.doesNotMatch(contextWithTool, /Unknown/);
+        }
+        finally {
+            rmSync(cwd, { recursive: true, force: true });
+        }
+    });
+    it('handles tool inventory with object entry shapes (name/tool_name/toolName fields)', () => {
+        const cwd = mkdtempSync(join(tmpdir(), 'omx-3866-tracker-tool-objects-'));
+        try {
+            const path = subagentTrackingPath(cwd);
+            mkdirSync(join(cwd, '.omx', 'state'), { recursive: true });
+            writeFileSync(path, JSON.stringify({ schemaVersion: 1, sessions: { root: { session_id: 'root', updated_at: '2026-07-23T00:00:00.000Z', threads: {
+                            child: { thread_id: 'child', kind: 'subagent', provenance_kind: NATIVE_SUBAGENT_PROVENANCE, direct_child_root_id: 'root', direct_child_parent_id: 'root', status: 'available', first_seen_at: '2026-07-23T00:00:00.000Z', last_seen_at: '2026-07-23T00:00:00.000Z', turn_count: 1 },
+                        } } } }));
+            // Object entry with 'name' field
+            const contextNameField = consumeDirectChildReopenContext(cwd, { sessionId: 'root', rootNativeSessionId: 'root', source: 'resume', availableTools: [{ name: 'Read' }, { name: 'resume_agent' }, { name: 'Edit' }] }) ?? '';
+            assert.match(contextNameField, /Reopen these persisted subagents/);
+            assert.match(contextNameField, /resume_agent\("child"\)/);
+            // Object entry with 'tool_name' field
+            const contextToolName = consumeDirectChildReopenContext(cwd, { sessionId: 'root', rootNativeSessionId: 'root', source: 'resume', availableTools: [{ tool_name: 'Read' }, { tool_name: 'resume_agent' }] }) ?? '';
+            assert.match(contextToolName, /Reopen these persisted subagents/);
+            assert.match(contextToolName, /resume_agent\("child"\)/);
+            // Object entry with 'toolName' field
+            const contextToolNameCamel = consumeDirectChildReopenContext(cwd, { sessionId: 'root', rootNativeSessionId: 'root', source: 'resume', availableTools: [{ toolName: 'Read' }, { toolName: 'resume_agent' }] }) ?? '';
+            assert.match(contextToolNameCamel, /Reopen these persisted subagents/);
+            assert.match(contextToolNameCamel, /resume_agent\("child"\)/);
+            // Object entry without matching fields (unknown)
+            const contextEmptyObject = consumeDirectChildReopenContext(cwd, { sessionId: 'root', rootNativeSessionId: 'root', source: 'resume', availableTools: [{ name: undefined, tool_name: undefined, toolName: undefined }] }) ?? '';
+            assert.match(contextEmptyObject, /Unknown: resume_agent tool availability could not be determined/);
+            assert.match(contextEmptyObject, /If resume_agent is callable/);
+        }
+        finally {
+            rmSync(cwd, { recursive: true, force: true });
+        }
+    });
+    it('emits unavailable warning when explicit unsupported native subagent evidence is provided', () => {
+        const cwd = mkdtempSync(join(tmpdir(), 'omx-3866-tracker-unsupported-evidence-'));
+        try {
+            const path = subagentTrackingPath(cwd);
+            mkdirSync(join(cwd, '.omx', 'state'), { recursive: true });
+            writeFileSync(path, JSON.stringify({ schemaVersion: 1, sessions: { root: { session_id: 'root', updated_at: '2026-07-23T00:00:00.000Z', threads: {
+                            child: { thread_id: 'child', kind: 'subagent', provenance_kind: NATIVE_SUBAGENT_PROVENANCE, direct_child_root_id: 'root', direct_child_parent_id: 'root', status: 'available', first_seen_at: '2026-07-23T00:00:00.000Z', last_seen_at: '2026-07-23T00:00:00.000Z', turn_count: 1 },
+                        } } } }));
+            // With explicit unsupported evidence, resume_agent is unavailable even with tool in inventory
+            const unsupportedEvidence = { status: 'unsupported', reason: 'native_subagents_unsupported', source: 'hook_payload_capability', evidenceSummary: 'test evidence' };
+            const contextUnavailable = consumeDirectChildReopenContext(cwd, {
+                sessionId: 'root',
+                rootNativeSessionId: 'root',
+                source: 'resume',
+                availableTools: ['read', 'resume_agent', 'edit'],
+                unsupportedNativeSubagentEvidence: unsupportedEvidence,
+            }) ?? '';
+            // Should emit warning about unavailable resume_agent
+            assert.match(contextUnavailable, /Warning: resume_agent tool is not available/);
+            assert.doesNotMatch(contextUnavailable, /resume_agent\(/);
+            assert.match(contextUnavailable, /Do not spawn a same-role\/same-lane replacement/);
+            // With unsupported evidence but without availableTools, still unavailable (not unknown)
+            const contextUnavailableNoTools = consumeDirectChildReopenContext(cwd, {
+                sessionId: 'root',
+                rootNativeSessionId: 'root',
+                source: 'resume',
+                unsupportedNativeSubagentEvidence: unsupportedEvidence,
+            }) ?? '';
+            assert.match(contextUnavailableNoTools, /Warning: resume_agent tool is not available/);
+            assert.doesNotMatch(contextUnavailableNoTools, /Unknown:/);
+            // Without unsupported evidence, back to unknown state (no tools in inventory)
+            const contextUnknown = consumeDirectChildReopenContext(cwd, { sessionId: 'root', rootNativeSessionId: 'root', source: 'resume' }) ?? '';
+            assert.match(contextUnknown, /Unknown: resume_agent tool availability could not be determined/);
+        }
+        finally {
+            rmSync(cwd, { recursive: true, force: true });
+        }
+    });
     it('revokes direct-child authority when an authoritative observation moves it under a nested parent', () => {
         const cwd = mkdtempSync(join(tmpdir(), 'omx-3284-tracker-direct-to-nested-'));
         try {
@@ -872,7 +968,7 @@ describe('subagents/tracker', () => {
         const cwd = mkdtempSync(join(tmpdir(), 'omx-3284-tracker-reopen-first-'));
         try {
             recordNativeSubagentAuthorityObservation(cwd, { sessionIds: ['canonical', 'root'], childThreadId: 'child', parentThreadId: 'root', rootNativeSessionId: 'root' });
-            const first = consumeDirectChildReopenContext(cwd, { sessionId: 'canonical', rootNativeSessionId: 'root', source: 'resume' }) ?? '';
+            const first = consumeDirectChildReopenContext(cwd, { sessionId: 'canonical', rootNativeSessionId: 'root', source: 'resume', availableTools: ['resume_agent'] }) ?? '';
             assert.match(first, /resume_agent\("child"\)/);
             const requestedAt = JSON.parse(readFileSync(subagentTrackingPath(cwd), 'utf8')).sessions.canonical.threads.child.resume_requested_at;
             assert.match(requestedAt, /^\d{4}-\d{2}-\d{2}T/);
@@ -925,7 +1021,7 @@ describe('subagents/tracker', () => {
                 competitor = spawnAuthorityCompetitor(cwd, 'revoke', readyPath, resultPath);
                 waitForFileSync(readyPath, 10_000);
             });
-            const first = consumeDirectChildReopenContext(cwd, { sessionId: 'canonical', rootNativeSessionId: 'root', source: 'resume' }) ?? '';
+            const first = consumeDirectChildReopenContext(cwd, { sessionId: 'canonical', rootNativeSessionId: 'root', source: 'resume', availableTools: ['resume_agent'] }) ?? '';
             __setCrossProcessPublishBarrierForTest(null);
             assert.match(first, /resume_agent\("child"\)/);
             const requestedAt = JSON.parse(readFileSync(subagentTrackingPath(cwd), 'utf8')).sessions.canonical.threads.child.resume_requested_at;