@topolo/cli 0.13.7 → 0.13.9

package/dist/{claude-pack-backend-3YJNKMYD.js → claude-pack-backend-4F4VHMI5.js}

@@ -24,7 +24,8 @@ async function nativeClaudePackOperation(manager, sidebar, plan, apply, checkpoi
   if (plan.noEffects && (plan.mode !== "recover" || previous?.effectAttempted)) throw new Error("No-effect recovery is not qualified.");
   if (apply) manager[fenceKey] = { operationId, running: true, effectAttempted: false };
   try {
-    verifyContext();
+    const incremental = (plan.mode ?? "configure") === "configure";
+    verifyContext(incremental ? [] : void 0);
     const checkDeadline = () => {
       if (Date.now() >= plan.deadline) throw new Error("Native operation deadline expired; reconcile journal before retry.");
     };
@@ -64,18 +65,28 @@ async function nativeClaudePackOperation(manager, sidebar, plan, apply, checkpoi
       const result = [];
       for (const member of members) {
         checkDeadline();
-        const session = await manager.getSession(member.sessionId);
+        let session = await manager.getSession(member.sessionId);
         if (!session || session.sessionId !== member.sessionId || session.cwd !== member.cwd || session.title !== member.title || session.isArchived && !["switch", "recover"].includes(plan.mode ?? "configure"))
           throw new Error("Owned session identity or active membership changed: " + member.key);
-        if (manager.hasLosableWork(member.sessionId) || session.isRunning || session.starting || session.pendingToolPermissions?.length)
+        let descriptor;
+        if (!incremental && (manager.hasLosableWork(member.sessionId) || session.isRunning || session.starting || session.pendingToolPermissions?.length))
           throw new Error("Session has live or pending work; no changes permitted: " + member.key);
         if (!plan.noEffects) {
-          const descriptor = await nativeDescriptor(member);
-          if (manager.hasLosableWork(member.sessionId) || descriptor.isRunning || descriptor.starting || descriptor.pendingToolPermissions?.length)
+          descriptor = await nativeDescriptor(member);
+          session = await manager.getSession(member.sessionId);
+          checkDeadline();
+          if (!session || session.sessionId !== member.sessionId || session.cwd !== member.cwd || session.title !== member.title || (session.isArchived || descriptor.isArchived) && incremental) throw new Error("Owned session identity or active membership changed: " + member.key);
+          if (!incremental && (manager.hasLosableWork(member.sessionId) || session.isRunning || session.starting || session.pendingToolPermissions?.length || descriptor.isRunning || descriptor.starting || descriptor.pendingToolPermissions?.length))
             throw new Error("Session has live or pending work; no changes permitted: " + member.key);
           if (descriptor.backend?.kind !== "local" || descriptor.backend.remoteTarget || descriptor.worktreePath || descriptor.worktreeLazy || descriptor.spawnedFrom)
             throw new Error("Incoming session is not a qualified local role.");
         }
+        const busyReasons = [
+          ...manager.hasLosableWork(member.sessionId) ? ["losable"] : [],
+          ...session.isRunning || descriptor?.isRunning ? ["running"] : [],
+          ...session.starting || descriptor?.starting ? ["starting"] : [],
+          ...session.pendingToolPermissions?.length || descriptor?.pendingToolPermissions?.length ? ["pending-permissions"] : []
+        ];
         result.push({
           key: member.key,
           sessionId: session.sessionId,
@@ -86,7 +97,8 @@ async function nativeClaudePackOperation(manager, sidebar, plan, apply, checkpoi
           model: session.model ?? null,
           effort: session.effort ?? null,
           permissionMode: session.permissionMode ?? null,
-          archived: session.isArchived === true
+          archived: session.isArchived === true,
+          ...incremental ? { busy: busyReasons.length > 0, busyReasons } : {}
         });
       }
       return result;
@@ -118,6 +130,124 @@ async function nativeClaudePackOperation(manager, sidebar, plan, apply, checkpoi
     const outgoingBefore = await outgoingSnapshot();
     const sections = await command({ kind: "list_sections" });
     checkpoint({ kind: "baseline", before, outgoingBefore, sections: sections.sections, at: Date.now() });
+    if (incremental) {
+      const settings = ["group", "pinned", "model", "effort", "permissionMode"];
+      const idleBefore = plan.members.filter((_, i) => !before[i].busy);
+      verifyContext([]);
+      if (!apply) return {
+        state: "preflight",
+        before,
+        outgoingBefore,
+        sections: sections.sections,
+        availableModels: models,
+        applied: false,
+        contextVerifiedSessionIds: idleBefore.map((m) => m.sessionId)
+      };
+      const appliedFields = [];
+      const deferredReasons = /* @__PURE__ */ new Map();
+      const differences = (member, row) => settings.filter((field) => member[field] !== row[field]);
+      for (const member of plan.members) {
+        const initial = (await snapshot([member]))[0];
+        if (initial.busy) {
+          deferredReasons.set(member.sessionId, initial.busyReasons);
+          continue;
+        }
+        for (const setting of differences(member, initial)) {
+          let row = (await snapshot([member]))[0];
+          if (row.busy) {
+            deferredReasons.set(member.sessionId, row.busyReasons);
+            break;
+          }
+          if (row[setting] === member[setting]) continue;
+          verifyContext([member]);
+          if (setting === "group" && member.group !== null) {
+            let matching = manager.listCustomGroups()?.filter((g) => g.name === member.group);
+            if (!matching || matching.length > 1) throw new Error("Ambiguous native sidebar group: " + member.group);
+            if (!matching.length) {
+              row = (await snapshot([member]))[0];
+              if (row.busy) {
+                deferredReasons.set(member.sessionId, row.busyReasons);
+                break;
+              }
+              verifyContext([member]);
+              checkDeadline();
+              checkpoint({ kind: "attempt", operation: "create_group", key: member.key, name: member.group, at: Date.now() });
+              manager[fenceKey].effectAttempted = true;
+              const created = await command({ kind: "create_group", name: member.group });
+              checkpoint({ kind: "acknowledged", operation: "create_group", key: member.key, name: member.group, at: Date.now() });
+              matching = manager.listCustomGroups()?.filter((g) => g.name === member.group);
+              if (!created.groupId) throw new Error("Native create_group did not return an identity.");
+              if (matching?.length !== 1 || matching[0].id !== created.groupId)
+                throw new Error("Native group read-back mismatch.");
+              verifyContext([member]);
+              appliedFields.push({ key: member.key, operation: "create_group", name: member.group });
+            }
+          }
+          row = (await snapshot([member]))[0];
+          if (row.busy) {
+            deferredReasons.set(member.sessionId, row.busyReasons);
+            break;
+          }
+          if (row[setting] === member[setting]) continue;
+          verifyContext([member]);
+          checkDeadline();
+          if (setting === "model" && !manager.getAvailableCodeModels().includes(member.model))
+            throw new Error("Requested model is absent from the native account catalog: " + member.model);
+          const operation = setting === "group" ? "move_sessions" : setting === "pinned" ? "set_pinned" : setting === "model" ? "set_model" : setting === "effort" ? "set_effort" : "set_permission_mode";
+          checkpoint({ kind: "attempt", operation, setting, key: member.key, sessionId: member.sessionId, at: Date.now() });
+          manager[fenceKey].effectAttempted = true;
+          if (setting === "group") {
+            const matching = member.group === null ? [] : manager.listCustomGroups()?.filter((g) => g.name === member.group);
+            if (!matching || member.group !== null && matching.length !== 1) throw new Error("Native group identity changed.");
+            await command({
+              kind: "move_sessions",
+              sessionIds: [member.sessionId],
+              ...member.group === null ? {} : { groupId: matching[0].id }
+            });
+          } else if (setting === "pinned") await command({ kind: "set_pinned", sessionId: member.sessionId, pinned: member.pinned });
+          else if (setting === "model") await manager.setModel(member.sessionId, member.model);
+          else if (setting === "effort") await manager.setEffort(member.sessionId, member.effort);
+          else if (!await manager.setPermissionMode(member.sessionId, member.permissionMode, "picker"))
+            throw new Error("Native permission mode was refused: " + member.key);
+          checkpoint({ kind: "acknowledged", operation, setting, key: member.key, sessionId: member.sessionId, at: Date.now() });
+          const actual = (await snapshot([member]))[0];
+          if (actual[setting] !== member[setting]) throw new Error("Native read-back mismatch: " + member.key + " / " + setting);
+          verifyContext([member]);
+          appliedFields.push({ key: member.key, sessionId: member.sessionId, setting, value: member[setting] });
+          checkpoint({ kind: "verified-field", operation, setting, key: member.key, sessionId: member.sessionId, at: Date.now() });
+        }
+      }
+      const after2 = await snapshot();
+      const idleAfter = plan.members.filter((member, i) => !after2[i].busy && !deferredReasons.has(member.sessionId));
+      verifyContext(idleAfter);
+      const deferred = plan.members.flatMap((member, i) => {
+        const row = after2[i], fields = differences(member, row);
+        if (!fields.length) return [];
+        const reasons = deferredReasons.get(member.sessionId) ?? row.busyReasons;
+        if (!reasons?.length) throw new Error("Native read-back mismatch: " + member.key + " / " + fields.join(","));
+        return [{ key: member.key, sessionId: member.sessionId, fields, reasons }];
+      });
+      const attestedBusyKeys = after2.filter((row) => row.busy && !deferred.some((d) => d.sessionId === row.sessionId)).map((row) => row.key);
+      checkpoint({ kind: deferred.length ? "partial-verified" : "verified", after: after2, appliedFields, deferred, attestedBusyKeys, at: Date.now() });
+      delete manager[fenceKey];
+      return {
+        state: deferred.length ? "native-settings-partial" : "native-settings-verified",
+        before,
+        after: after2,
+        outgoingAfter: [],
+        verifiedAgents: after2.length - deferred.length,
+        complete: deferred.length === 0,
+        applied: appliedFields.length > 0,
+        appliedFields,
+        deferred,
+        attestedBusyKeys,
+        contextVerifiedSessionIds: idleAfter.map((m) => m.sessionId),
+        busyObservations: [...deferredReasons].map(([sessionId, reasons]) => ({ key: plan.members.find((m) => m.sessionId === sessionId).key, sessionId, reasons })),
+        modelInferenceVerified: false,
+        readOnlyConfinementVerified: false,
+        fullPackSwitchSupported: false
+      };
+    }
     if (plan.mode === "recover") {
       if (plan.noEffects) {
         verifyContext();
@@ -672,6 +802,7 @@ function prepareClaudeNativePlan(store, pack, policyPath, mode = "configure") {
   if (!records.length || records.length !== policy.agents.length) throw new Error("Reviewed policy must cover the complete installed roster.");
   const members = [];
   const context = {};
+  const roleContextFiles = {};
   const contextInventories = {};
   const captureMarkdown = (cwd) => {
     contextInventories[cwd] = snapshotClaudeMarkdown(cwd, filesystem, cryptography, paths);
@@ -690,6 +821,7 @@ function prepareClaudeNativePlan(store, pack, policyPath, mode = "configure") {
     const transcript = realpathSync(record.transcript);
     context[charter] = createHash("sha256").update(readFileSync(charter)).digest("hex");
     context[transcript] = createHash("sha256").update(readFileSync(transcript)).digest("hex");
+    roleContextFiles[record.desktopSessionId] = [charter, transcript];
     members.push({
       key: record.key,
       sessionId: record.desktopSessionId,
@@ -744,6 +876,8 @@ function prepareClaudeNativePlan(store, pack, policyPath, mode = "configure") {
     outgoing,
     context,
     contextInventories,
+    roleContextFiles,
+    globalContextFiles: [resolve(root, "claude/state.json"), realpathSync(policyPath)],
     approvalRoutes,
     installationConsent: policy.installationConsent,
     libraryRoot: root,
@@ -752,6 +886,27 @@ function prepareClaudeNativePlan(store, pack, policyPath, mode = "configure") {
     activeBefore: active
   };
 }
+function verifyClaudePlanContext(plan, members, fs, crypto, path, snapshotMarkdown) {
+  if (!plan.contextInventories || !Object.keys(plan.contextInventories).length) throw new Error("Complete context inventory proof is unavailable.");
+  if (members && (!plan.roleContextFiles || !plan.globalContextFiles?.length)) throw new Error("Scoped role context proof is unavailable.");
+  const selected = members ?? plan.members;
+  if (new Set(selected.map((m) => m.sessionId)).size !== selected.length || selected.some((m) => !plan.members.some((p) => p.sessionId === m.sessionId && p.key === m.key && p.cwd === m.cwd && p.title === m.title)))
+    throw new Error("Scoped context identity differs from the complete roster.");
+  const roots = members ? selected.map((m) => m.cwd) : Object.keys(plan.contextInventories);
+  for (const root of roots) {
+    const inventory = plan.contextInventories[root];
+    if (!inventory || JSON.stringify(snapshotMarkdown(root, fs, crypto, path)) !== JSON.stringify(inventory))
+      throw new Error("Context or transcript changed during configuration: Markdown inventory " + root);
+  }
+  const files = members ? [...plan.globalContextFiles, ...selected.flatMap((m) => {
+    const files2 = plan.roleContextFiles[m.sessionId];
+    if (!files2?.length) throw new Error("Scoped role context proof is unavailable.");
+    return files2;
+  })] : Object.keys(plan.context);
+  for (const file of files)
+    if (!plan.context[file] || crypto.createHash("sha256").update(fs.readFileSync(file)).digest("hex") !== plan.context[file])
+      throw new Error("Context or transcript changed during configuration: " + file);
+}
 function qualifyPermissionConsent(policy, key, records, full) {
   const consent = policy.installationConsent;
   const intakeKey = consent?.intakeRoutes?.[key];
@@ -784,15 +939,9 @@ function nativePackExpression(pid, plan, journal, apply) {
     const context = ${JSON.stringify(plan.context)};
     const inventories = ${JSON.stringify(plan.contextInventories)};
     const snapshotMarkdown = (${snapshotClaudeMarkdown.toString()});
-    const verifyContext = () => {
-      if (!inventories || !Object.keys(inventories).length) throw new Error('Complete context inventory proof is unavailable.');
-      for (const [root, inventory] of Object.entries(inventories))
-        if (JSON.stringify(snapshotMarkdown(root, fs, crypto, path)) !== JSON.stringify(inventory))
-          throw new Error('Context or transcript changed during configuration: Markdown inventory ' + root);
-      for (const [file, hash] of Object.entries(context))
-        if (crypto.createHash('sha256').update(fs.readFileSync(file)).digest('hex') !== hash)
-          throw new Error('Context or transcript changed during configuration: ' + file);
-    };
+    const contextPlan = {context, contextInventories: inventories, members: ${JSON.stringify(plan.members)},
+      roleContextFiles: ${JSON.stringify(plan.roleContextFiles)}, globalContextFiles: ${JSON.stringify(plan.globalContextFiles)}};
+    const verifyContext = members => (${verifyClaudePlanContext.toString()})(contextPlan, members, fs, crypto, path, snapshotMarkdown);
     const result = await (${nativeClaudePackOperation.toString()})(manager,
       value => transport.P(value, transport.M),
       { members: ${JSON.stringify(plan.members)}, outgoing: ${JSON.stringify(plan.outgoing)},
@@ -815,15 +964,61 @@ function nativePackExpression(pid, plan, journal, apply) {
         row => checkpoint({kind: 'approval', ...row}),
         fs.readFileSync(expected.journal, 'utf8').split('\\n').filter(Boolean).map(line => JSON.parse(line)));
       if (expected.apply) {
-        result.approvalRouting = await invoke({kind: 'install'});
         const control = ${JSON.stringify(plan.control)};
         if (!control) throw new Error('Owned native control setup is unavailable.');
-        const stat = fs.lstatSync(control.secretPath);
-        if (!stat.isFile() || stat.isSymbolicLink() || stat.uid !== process.getuid() || (stat.mode & 63)) throw new Error('Unowned native control secret.');
-        const secret = JSON.parse(fs.readFileSync(control.secretPath, 'utf8'));
-        result.approvalRouting.control = await (${nativeClaudeApprovalControl.toString()})(manager,
-          {socket: control.socket, pid: expected.pid, identity: fingerprint(routes)}, secret.token,
-          load('node:net'), fs, invoke, qualifyNative, checkpoint);
+        const identity = fingerprint(routes);
+        const current = manager[Symbol.for('topolo.agent-pack.approval-control.v1')];
+        const listener = manager[Symbol.for('topolo.agent-pack.approvals.v1')];
+        const incremental = ${JSON.stringify(plan.mode === "configure" && !plan.recovery)};
+        const unchanged = listener?.identity === identity && listener.listener && !listener.auditFailed &&
+          current?.descriptor.pid === expected.pid && current.descriptor.identity === identity &&
+          current.descriptor.socket === control.socket && current.server?.listening === true && !current.failure;
+        if (!incremental) {
+          result.approvalRouting = await invoke({kind: 'install'});
+          const stat = fs.lstatSync(control.secretPath);
+          if (!stat.isFile() || stat.isSymbolicLink() || stat.uid !== process.getuid() || (stat.mode & 63)) throw new Error('Unowned native control secret.');
+          const secret = JSON.parse(fs.readFileSync(control.secretPath, 'utf8'));
+          result.approvalRouting.control = await (${nativeClaudeApprovalControl.toString()})(manager,
+            {socket: control.socket, pid: expected.pid, identity}, secret.token,
+            load('node:net'), fs, invoke, qualifyNative, checkpoint);
+        } else if (unchanged) {
+          // Re-attest the owned listener/control; do not replace matching hooks
+          // or interrupt an in-flight request merely to configure idle settings.
+          result.approvalRouting = {state: 'native-approval-listener-installed', roles: routes.length,
+            identity, control: current.descriptor, unchanged: true};
+        } else {
+          qualifyNative();
+          const deferred = [];
+          for (const route of routes) {
+            const descriptor = await manager.getSessionWhenLoaded(route.sessionId, 'topolo-agent-pack-approval', {warnOnMiss: false});
+            const session = await manager.getSession(route.sessionId);
+            if (!descriptor || descriptor.sessionId !== route.sessionId || descriptor.cwd !== route.cwd || descriptor.title !== route.title ||
+                descriptor.isArchived || descriptor.backend?.kind !== 'local' || descriptor.backend.remoteTarget || descriptor.worktreePath ||
+                descriptor.worktreeLazy || descriptor.spawnedFrom || !session || session.sessionId !== route.sessionId ||
+                session.cwd !== route.cwd || session.title !== route.title || session.isArchived)
+              throw new Error('Native approval route ownership changed.');
+            if (session.pendingToolPermissions?.length || descriptor.pendingToolPermissions?.length)
+              deferred.push({key: route.key, fields: ['intakeHooks'], reason: 'pending-permissions'});
+          }
+          if (current?.active || current?.failure || listener?.auditFailed ||
+              (listener && listener.identity !== identity) ||
+              (current && (current.descriptor.pid !== expected.pid || current.descriptor.identity !== identity)))
+            for (const route of routes) deferred.push({key: route.key, fields: ['intakeHooks'], reason: 'existing-control-custody'});
+          if (deferred.length) {
+            result.routingDeferred = deferred;
+            result.state = 'native-settings-partial';result.complete = false;
+            checkpoint({kind: 'routing-deferred', deferred, at: Date.now()});
+          } else {
+            verifyContext(result.after.filter(row => !row.busy).map(row => contextPlan.members.find(m => m.sessionId === row.sessionId)));
+            result.approvalRouting = await invoke({kind: 'install'});
+            const stat = fs.lstatSync(control.secretPath);
+            if (!stat.isFile() || stat.isSymbolicLink() || stat.uid !== process.getuid() || (stat.mode & 63)) throw new Error('Unowned native control secret.');
+            const secret = JSON.parse(fs.readFileSync(control.secretPath, 'utf8'));
+            result.approvalRouting.control = await (${nativeClaudeApprovalControl.toString()})(manager,
+              {socket: control.socket, pid: expected.pid, identity}, secret.token,
+              load('node:net'), fs, invoke, qualifyNative, checkpoint);
+          }
+        }
       } else if (${JSON.stringify(plan.recovery === true && !plan.noEffects)}) {
         const current = manager[Symbol.for('topolo.agent-pack.approval-control.v1')];
         if (!current || current.descriptor.pid !== expected.pid || current.descriptor.identity !== fingerprint(routes))
@@ -920,13 +1115,8 @@ function syncDirectory(path) {
     closeSync(fd);
   }
 }
-function verifyPlanContext(plan) {
-  if (!plan.contextInventories || !Object.keys(plan.contextInventories).length) throw new Error("Complete context inventory proof is unavailable.");
-  for (const [root, inventory] of Object.entries(plan.contextInventories))
-    if (JSON.stringify(snapshotClaudeMarkdown(root, filesystem, cryptography, paths)) !== JSON.stringify(inventory))
-      throw new Error("Context or transcript changed during configuration: Markdown inventory " + root);
-  for (const [file, hash] of Object.entries(plan.context))
-    if (createHash("sha256").update(readFileSync(file)).digest("hex") !== hash) throw new Error("Context or transcript changed during configuration: " + file);
+function verifyPlanContext(plan, members) {
+  verifyClaudePlanContext(plan, members, filesystem, cryptography, paths, snapshotClaudeMarkdown);
 }
 function verifyClaudeOrganizationPolicy(root, pack, consent, run = spawnSync, locate = existsSync) {
   const here = dirname(fileURLToPath(import.meta.url));
@@ -976,18 +1166,35 @@ async function configureClaudePack(options, evaluate = evaluateClaudeMain, quali
     } else {
       plan = { ...prepareClaudeNativePlan(root, options.pack, options.policy, options.mode === "switch" ? "switch" : "configure"), operationId };
       if (options.apply && plan.approvalRoutes.length) {
-        const directory2 = resolve(root, "claude/private");
-        mkdirSync(directory2, { recursive: true, mode: 448 });
-        const socketDirectory = resolve("/tmp", "topolo-claude-pack-" + createHash("sha256").update(root).digest("hex").slice(0, 16));
-        mkdirSync(socketDirectory, { recursive: true, mode: 448 });
-        for (const path of [directory2, socketDirectory]) {
-          const stat = lstatSync(path);
-          if (!stat.isDirectory() || stat.isSymbolicLink() || stat.uid !== process.getuid?.() || stat.mode & 63)
-            throw new Error("Native control directory must be owned and private.");
+        const connectionPath = resolve(root, "claude/approval-connection.json");
+        if (plan.mode === "configure" && existsSync(connectionPath)) {
+          const entry = lstatSync(connectionPath);
+          if (!entry.isFile() || entry.isSymbolicLink() || typeof process.getuid !== "function" || entry.uid !== process.getuid() || entry.mode & 63)
+            throw new Error("Unowned native approval connection.");
+          const connection = JSON.parse(readFileSync(connectionPath, "utf8"));
+          if (connection.pid === options.pid && connection.pack === options.pack && JSON.stringify(connection.routes) === JSON.stringify(plan.approvalRoutes) && JSON.stringify(connection.installationConsent) === JSON.stringify(plan.installationConsent)) {
+            if (typeof connection.secretPath !== "string" || typeof connection.socket !== "string" || !resolve(connection.secretPath).startsWith(realpathSync(resolve(root, "claude/private")) + sep) || realpathSync(connection.secretPath) !== resolve(connection.secretPath) || dirname(resolve(connection.socket)) !== resolve("/tmp", "topolo-claude-pack-" + createHash("sha256").update(root).digest("hex").slice(0, 16)))
+              throw new Error("Native approval connection is outside owned control paths.");
+            const secret = lstatSync(connection.secretPath);
+            if (!secret.isFile() || secret.isSymbolicLink() || typeof process.getuid !== "function" || secret.uid !== process.getuid() || secret.mode & 63)
+              throw new Error("Unowned native control secret.");
+            plan.control = { socket: connection.socket, secretPath: connection.secretPath };
+          }
+        }
+        if (!plan.control) {
+          const directory2 = resolve(root, "claude/private");
+          mkdirSync(directory2, { recursive: true, mode: 448 });
+          const socketDirectory = resolve("/tmp", "topolo-claude-pack-" + createHash("sha256").update(root).digest("hex").slice(0, 16));
+          mkdirSync(socketDirectory, { recursive: true, mode: 448 });
+          for (const path of [directory2, socketDirectory]) {
+            const stat = lstatSync(path);
+            if (!stat.isDirectory() || stat.isSymbolicLink() || stat.uid !== process.getuid?.() || stat.mode & 63)
+              throw new Error("Native control directory must be owned and private.");
+          }
+          plan.control = { socket: resolve(socketDirectory, operationId + ".sock"), secretPath: resolve(directory2, operationId + ".json") };
+          durableRecord(plan.control.secretPath, { token: randomBytes(32).toString("hex") }, "wx");
+          syncDirectory(directory2);
         }
-        plan.control = { socket: resolve(socketDirectory, operationId + ".sock"), secretPath: resolve(directory2, operationId + ".json") };
-        durableRecord(plan.control.secretPath, { token: randomBytes(32).toString("hex") }, "wx");
-        syncDirectory(directory2);
       }
       journal = resolve(directory, operationId + ".jsonl");
       const record = { kind: "plan", pack: options.pack, ...plan, apply: options.apply };
@@ -998,7 +1205,8 @@ async function configureClaudePack(options, evaluate = evaluateClaudeMain, quali
       syncDirectory(resolve(root, "claude"));
     }
     try {
-      verifyPlanContext(plan);
+      const incremental = !recovering && plan.mode === "configure";
+      verifyPlanContext(plan, incremental ? [] : void 0);
       const organizationPolicy = options.apply && plan.approvalRoutes.length ? qualify(root, options.pack, plan.installationConsent) : null;
       if (options.apply) {
         const dispatched = { ...marker, dispatchState: "may-have-effects" };
@@ -1009,7 +1217,18 @@ async function configureClaudePack(options, evaluate = evaluateClaudeMain, quali
         marker = dispatched;
       }
       const result = await evaluate(options.endpoint, nativePackExpression(options.pid, plan, journal, options.apply));
-      verifyPlanContext(plan);
+      if (incremental && result.contextVerifiedSessionIds !== void 0) {
+        if (!Array.isArray(result.contextVerifiedSessionIds) || new Set(result.contextVerifiedSessionIds).size !== result.contextVerifiedSessionIds.length || result.contextVerifiedSessionIds.some((id) => !plan.members.some((m) => m.sessionId === id)))
+          throw new Error("Native scoped context identities differ.");
+        const observations = result.busyObservations ?? [];
+        if (!Array.isArray(observations) || observations.some((row) => !plan.members.some((m) => m.key === row.key && m.sessionId === row.sessionId) || !Array.isArray(row.reasons) || !row.reasons.length || row.reasons.some((reason) => !["running", "starting", "losable", "pending-permissions"].includes(reason))))
+          throw new Error("Native busy context attestation differs.");
+        for (let i = 0; i < plan.members.length; i++)
+          if (!result.contextVerifiedSessionIds.includes(plan.members[i].sessionId) && result.after?.[i]?.busy !== true && !observations.some((row) => row.sessionId === plan.members[i].sessionId))
+            throw new Error("Native result omits idle context qualification.");
+      }
+      const contextMembers = incremental && Array.isArray(result.after) ? plan.members.filter((m, i) => result.after[i]?.busy !== true && (result.contextVerifiedSessionIds === void 0 || result.contextVerifiedSessionIds.includes(m.sessionId))) : void 0;
+      verifyPlanContext(plan, contextMembers);
       if (options.apply || recovering) {
         if (plan.noEffects) {
           if (result.state !== "native-reconciled-no-effects" || result.nativeEffectsReplayed !== false || result.after?.length !== plan.members.length || result.after.some((actual, i) => ["key", "sessionId", "cwd", "title"].some((key) => actual[key] !== plan.members[i][key])))
@@ -1023,6 +1242,46 @@ async function configureClaudePack(options, evaluate = evaluateClaudeMain, quali
           syncDirectory(resolve(root, "claude"));
           return { ...result, journal, contextPreserved: true };
         }
+        if (incremental && result.state === "native-settings-partial") {
+          const settings = ["group", "pinned", "model", "effort", "permissionMode"];
+          if (result.after?.length !== plan.members.length || !Array.isArray(result.deferred) || !result.deferred.length && !result.routingDeferred?.length) throw new Error("Native partial result has no qualified complete roster.");
+          if (new Set(result.deferred.map((d) => d.sessionId)).size !== result.deferred.length || result.deferred.some((d) => !plan.members.some((m) => m.key === d.key && m.sessionId === d.sessionId) || !Array.isArray(d.fields) || !d.fields.length || new Set(d.fields).size !== d.fields.length || d.fields.some((field) => !settings.includes(field)) || !Array.isArray(d.reasons) || !d.reasons.length || d.reasons.some((reason) => !["running", "starting", "losable", "pending-permissions"].includes(reason))))
+            throw new Error("Native deferred identity or fields differ.");
+          if (result.routingDeferred !== void 0 && (!Array.isArray(result.routingDeferred) || result.routingDeferred.some((d) => !plan.approvalRoutes.some((r) => r.key === d.key) || JSON.stringify(d.fields) !== JSON.stringify(["intakeHooks"]) || !["pending-permissions", "existing-control-custody"].includes(d.reason))))
+            throw new Error("Native deferred routing ownership differs.");
+          for (let i = 0; i < plan.members.length; i++) {
+            const wanted = plan.members[i], actual = result.after[i];
+            if (actual.archived !== false || ["key", "sessionId", "cwd", "title"].some((key) => actual[key] !== wanted[key]))
+              throw new Error("Native partial roster identity differs.");
+            const mismatch = settings.filter((key) => actual[key] !== wanted[key]);
+            const deferred = result.deferred.find((d) => d.sessionId === wanted.sessionId);
+            if (JSON.stringify(mismatch.slice().sort()) !== JSON.stringify((deferred?.fields ?? []).slice().sort()))
+              throw new Error("Native partial result hides an undeferred mismatch.");
+          }
+          const activePath2 = resolve(root, "claude/active.json");
+          const active2 = existsSync(activePath2) ? JSON.parse(readFileSync(activePath2, "utf8")) : null;
+          if (JSON.stringify(active2) !== JSON.stringify(plan.activeBefore)) throw new Error("Active roster changed during partial configuration.");
+          durableRecord(journal, {
+            kind: "partial-verified",
+            after: result.after,
+            deferred: result.deferred,
+            routingDeferred: result.routingDeferred ?? [],
+            appliedFields: result.appliedFields ?? [],
+            activeUnchanged: true
+          });
+          if (JSON.stringify(JSON.parse(readFileSync(markerPath, "utf8"))) !== JSON.stringify(marker)) throw new Error("Recovery marker identity changed.");
+          unlinkSync(markerPath);
+          syncDirectory(resolve(root, "claude"));
+          return {
+            ...result,
+            complete: false,
+            journal,
+            contextPreserved: contextMembers?.length === plan.members.length,
+            idleContextsVerified: contextMembers?.map((m) => m.key),
+            activeRosterUnchanged: true,
+            resume: "explicit-configure-only"
+          };
+        }
         if (result.state !== (recovering ? "native-reconciled" : "native-settings-verified") || result.after?.length !== plan.members.length) throw new Error("Native result has no complete verified roster.");
         for (let i = 0; i < plan.members.length; i++) {
           const wanted = plan.members[i];
@@ -1066,7 +1325,12 @@ async function configureClaudePack(options, evaluate = evaluateClaudeMain, quali
         unlinkSync(markerPath);
         syncDirectory(resolve(root, "claude"));
       } else durableRecord(journal, { kind: "context-verified", context: plan.context });
-      return { ...result, journal, contextPreserved: true };
+      return {
+        ...result,
+        journal,
+        contextPreserved: !incremental || contextMembers?.length === plan.members.length,
+        ...incremental ? { idleContextsVerified: contextMembers?.map((m) => m.key) } : {}
+      };
     } catch (error) {
       durableRecord(journal, { kind: "recovery-required" });
       throw new Error(`Claude configuration is incomplete. Reconcile ${journal}. ${error instanceof Error ? error.message : String(error)}`);
@@ -1203,5 +1467,6 @@ export {
   runClaudeSmokeHelper,
   snapshotClaudeMarkdown,
   validateInspectorEndpoint,
-  verifyClaudeOrganizationPolicy
+  verifyClaudeOrganizationPolicy,
+  verifyClaudePlanContext
 };