@agfpd/iapeer 0.2.5 → 0.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agfpd/iapeer",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Foundation core for the IAPeer multi-agent ecosystem: identity, registry, storage, codec.",
   "type": "module",
   "bin": {

package/src/launch/adapters/claude.ts

@@ -30,15 +30,17 @@ import type { ControlCommand, ControlPlan, LaunchAdapterConfig, LaunchSpec, Runt
 // ─────────────────────────────────────────────────────────────────────────────
 
 /**
- * The known claude startup dialogs whose default-highlighted option is the
- * proceed path, so a single Enter clears each:
+ * Markers that a claude startup dialog / picker is on screen — used by isInputReady
+ * to GATE delivery (a dialog up ⇒ not ready). The KEYS that clear each live in
+ * bootDialogKeys (NOT uniformly Enter — the resume picker must be NAVIGATED, see there):
  *   - 'trust this folder'                      — first-run folder-trust modal.
  *   - 'Allow external CLAUDE.md file imports?' — external-import consent.
  *   - 'I am using this for local development'   — dev-channels accept
  *     (claude-start.sh:337), shown when PEER_START_ARGS carries
  *     --dangerously-load-development-channels.
- *   - 'Resume from summary' / 'Resuming the full session' — the --resume picker.
- * Same set, same order as lifecycle.claudeBootDialog (index.ts:281-289).
+ *   - 'Resume from summary'      — the resume compact-picker (default cursor =
+ *     "summary (recommended)", which compacts; bootDialogKeys picks "full" instead).
+ *   - 'Resuming the full session' — the post-select load state (still not ready).
  */
 const CLAUDE_BOOT_DIALOG_MARKERS = [
   'trust this folder',
@@ -104,7 +106,7 @@ export const claudeAdapter: RuntimeAdapter = {
 
   /**
    * argv = claudeBin + headless flags + (system-prompt-file when set) +
-   * (--resume <ref> when resumeRef set) + extraArgs.
+   * (--continue when resuming) + extraArgs.
    *
    *   - '--dangerously-skip-permissions'  claude-start.sh:318, spawner.ts:776 —
    *     headless peer has no interactive owner to grant per-tool permission.
@@ -117,8 +119,15 @@ export const claudeAdapter: RuntimeAdapter = {
    *     ONLY when set (a tui runtime that usesDoctrine composes one). Swaps the
    *     CC coding baseline for the merged peer doctrine; plugin/MCP/CLAUDE.md
    *     layers stay intact (claude-start.sh:293-303).
-   *   - '--resume', spec.resumeRef  spawner.ts:779-781 — ONLY when the caller
-   *     pre-resolved a uuid (resolveResume); never a silent fresh fallback.
+   *   - '--continue' when spec.resume — continue the cwd's MOST-RECENT session
+   *     (one session-lineage per peer cwd, so most-recent == the warm peer's
+   *     session, == the newest transcript resolveResume validated). NOT
+   *     '--resume <uuid>': in claude 2.1.169 `--resume <arg>` treats arg as a
+   *     SEARCH QUERY (opens a session-list picker), not a session-id — so a bare
+   *     uuid no longer resumes directly. `--continue` resumes the last session
+   *     with no session-list step. The summary-vs-full compact picker still
+   *     appears (handled in bootDialogKeys: pick "full", never the recommended
+   *     summary). resolveResume still gates resume-vs-fresh upstream (fail-loud).
    *   - ...extraArgs  PEER_START_ARGS passthrough (LaunchSpec.extraArgs).
    * NO currency — no marketplace/install/update on this path.
    */
@@ -129,19 +138,37 @@ export const claudeAdapter: RuntimeAdapter = {
       '--disallowedTools',
       'AskUserQuestion',
       ...(spec.systemPromptFile ? ['--system-prompt-file', spec.systemPromptFile] : []),
-      ...(spec.resumeRef ? ['--resume', spec.resumeRef] : []),
+      ...(spec.resume ? ['--continue'] : []),
       ...(spec.extraArgs ?? []),
     ]
   },
 
   /**
-   * A visible startup dialog → ['Enter'] to clear it (its default-highlighted
-   * option is the proceed path), else null. Same marker set as
-   * lifecycle.claudeBootDialog; claude-start.sh:341 (dev-channels) and the
-   * folder-trust/import/resume modals all accept a bare Enter.
+   * Map a visible startup dialog to the keys that clear it correctly:
+   *
+   *   - RESUME COMPACT-PICKER ('Resume from summary …') → ['Down','Enter'].
+   *     This menu's cursor DEFAULTS to "1. Resume from summary (recommended)",
+   *     and selecting it COMPACTS the session (claude implements that choice as an
+   *     internal /compact). A bare Enter would therefore silently compact a warm
+   *     peer on EVERY idle-reap→resume — losing its full context. Move the cursor
+   *     DOWN one to "2. Resume full session as-is" and confirm, keeping full
+   *     context. (Verified against the live picker: ❯ on option 1, ↑↓ navigation,
+   *     "Enter to confirm".)
+   *   - OTHER MODALS (folder-trust / external-import / dev-channels) → ['Enter']:
+   *     their default-highlighted option IS the proceed path, so a bare Enter clears
+   *     each (claude-start.sh:341).
+   *   - anything else (incl. the post-select "Resuming…" load state) → null (wait).
    */
   bootDialogKeys(pane: string): string[] | null {
-    return anyBootDialog(pane) ? ['Enter'] : null
+    if (pane.includes('Resume from summary')) return ['Down', 'Enter']
+    if (
+      pane.includes('trust this folder') ||
+      pane.includes('Allow external CLAUDE.md file imports?') ||
+      pane.includes('I am using this for local development')
+    ) {
+      return ['Enter']
+    }
+    return null
   },
 
   /**

package/src/launch/launch.test.ts

@@ -120,9 +120,12 @@ describe('claudeAdapter', () => {
     ])
   })
 
-  test('buildArgv with system-prompt-file + resume + extras (exact flags/order)', () => {
+  test('buildArgv with system-prompt-file + resume + extras → --continue (NOT --resume <uuid>)', () => {
+    // resume uses `--continue` (continue the cwd's most-recent session), NOT
+    // `--resume <uuid>` — in claude 2.1.169 `--resume <arg>` is a search query, not a
+    // session-id. resumeRef is set by the daemon but no longer consumed by the launch.
     const argv = claudeAdapter.buildArgv(
-      spec({ systemPromptFile: '/tmp/sp.md', resumeRef: 'uuid-1', extraArgs: ['--foo'] }),
+      spec({ systemPromptFile: '/tmp/sp.md', resume: true, resumeRef: 'uuid-1', extraArgs: ['--foo'] }),
       cfg,
     )
     expect(argv).toEqual([
@@ -132,10 +135,17 @@ describe('claudeAdapter', () => {
       'AskUserQuestion',
       '--system-prompt-file',
       '/tmp/sp.md',
-      '--resume',
-      'uuid-1',
+      '--continue',
       '--foo',
     ])
+    expect(argv).not.toContain('--resume')
+    expect(argv).not.toContain('uuid-1')
+  })
+
+  test('buildArgv: resume FALSE (fresh) → no --continue / --resume', () => {
+    const argv = claudeAdapter.buildArgv(spec({ resume: false, resumeRef: 'uuid-1' }), cfg)
+    expect(argv).not.toContain('--continue')
+    expect(argv).not.toContain('--resume')
   })
 
   test('buildArgv carries NO currency (no marketplace/plugin tokens)', () => {
@@ -153,12 +163,23 @@ describe('claudeAdapter', () => {
     expect(claudeAdapter.isInputReady('❯ just a prompt')).toBe(false)
   })
 
-  test('bootDialogKeys: a dialog → [Enter], clean pane → null', () => {
+  test('bootDialogKeys: proceed-modals → [Enter]; clean/load pane → null', () => {
     expect(claudeAdapter.bootDialogKeys('I am using this for local development')).toEqual(['Enter'])
-    expect(claudeAdapter.bootDialogKeys('Resuming the full session')).toEqual(['Enter'])
+    expect(claudeAdapter.bootDialogKeys('trust this folder')).toEqual(['Enter'])
+    expect(claudeAdapter.bootDialogKeys('Allow external CLAUDE.md file imports?')).toEqual(['Enter'])
+    // the post-select "Resuming…" load state is NOT a modal to Enter — just wait.
+    expect(claudeAdapter.bootDialogKeys('Resuming the full session')).toBeNull()
     expect(claudeAdapter.bootDialogKeys('❯ ready')).toBeNull()
   })
 
+  test('bootDialogKeys: resume compact-picker → [Down, Enter] (pick "full", NOT the recommended summary)', () => {
+    // Default cursor is "1. Resume from summary (recommended)"; bare Enter would compact.
+    // Move DOWN to "2. Resume full session as-is" and confirm → full context preserved.
+    expect(
+      claudeAdapter.bootDialogKeys('❯ 1. Resume from summary (recommended)\n  2. Resume full session as-is'),
+    ).toEqual(['Down', 'Enter'])
+  })
+
   test('permissionDialog: proceed prompt → active, [Enter]', () => {
     expect(claudeAdapter.permissionDialogActive('Do you want to proceed?')).toBe(true)
     expect(claudeAdapter.permissionDialogActive('nothing')).toBe(false)