@hey-hey/cli 4.1.1 → 4.1.2

package/dist/index.js

@@ -403,7 +403,7 @@ var require_cli_options = __commonJS({
 var version;
 var init_package = __esm({
   "package.json"() {
-    version = "4.1.1";
+    version = "4.1.2";
   }
 });
 
@@ -834,6 +834,7 @@ var init_api = __esm({
       InitiativeRefinement: "initiative-refinement",
       Onboarding: "onboarding",
       RepositoryImport: "repository-import",
+      WorkTrackerImport: "work-tracker-import",
       Rfc: "rfc",
       TaskGeneration: "task-generation",
       TaskRefinement: "task-refinement",
@@ -171221,7 +171222,7 @@ var init_project_mode_contract_schema = __esm({
 });
 
 // src/agents/project-mode/project-mode-snapshot.ts
-var import_ajv2, import_ajv_formats2, ajv, validateSelection, validateSnapshot, formatIssue, validateProjectModeConfig;
+var import_ajv2, import_ajv_formats2, ajv, validateSelection, validateSnapshot, formatIssue, hasCapturedProjectModeConfig, validateProjectModeConfig;
 var init_project_mode_snapshot = __esm({
   "src/agents/project-mode/project-mode-snapshot.ts"() {
     "use strict";
@@ -171247,6 +171248,7 @@ var init_project_mode_snapshot = __esm({
       const path55 = missingProperty ? `${issue3.instancePath}/${missingProperty}` : issue3.instancePath || "/";
       return `${prefix2}${path55} ${issue3.message ?? "is invalid"}`;
     };
+    hasCapturedProjectModeConfig = (config3) => config3?.type === "CODING_SESSION" && ("projectModeSelection" in config3 || "projectModeSnapshot" in config3);
     validateProjectModeConfig = (config3) => {
       if (!config3 || typeof config3 !== "object" || Array.isArray(config3) || !("type" in config3) || !("version" in config3) || config3.type !== "CODING_SESSION" || config3.version !== "v2") {
         return {
@@ -171639,7 +171641,7 @@ var init_project_mode_bundle_restorer = __esm({
       logger;
       async restore(session) {
         const config3 = session.config;
-        if (config3?.type !== "CODING_SESSION" || !("projectModeSelection" in config3) && !("projectModeSnapshot" in config3)) {
+        if (!hasCapturedProjectModeConfig(config3)) {
           this.logger.debug("local.run_restore.project_mode_bundle.skipped", {
             runId: session.agentic_session_id,
             reason: "captured_project_mode_config_absent"
@@ -187589,9 +187591,9 @@ var init_run_index = __esm({
         await import_promises20.default.writeFile(tmp, JSON.stringify(index, null, 2), "utf8");
         await import_promises20.default.rename(tmp, indexPath);
       }
-      addRun(index, run2, replaceBinding = false) {
+      addRun(index, run2) {
         const agentSessionId = readAgentSessionId(run2);
-        if (agentSessionId && (replaceBinding || !index.byAgentSessionId[agentSessionId])) {
+        if (agentSessionId) {
           index.byAgentSessionId[agentSessionId] = run2.agentic_session_id;
         }
         if (run2.provider_session_id) {
@@ -187608,7 +187610,7 @@ var init_run_index = __esm({
           }
           index.byPromptType[run2.promptType] = list;
         }
-        if (run2.conversationId && (replaceBinding || !index.byConversationId[run2.conversationId])) {
+        if (run2.conversationId) {
           index.byConversationId[run2.conversationId] = run2.agentic_session_id;
         }
       }
@@ -187676,7 +187678,7 @@ var init_run_index = __esm({
           (a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()
         );
         for (const run2 of sorted) {
-          this.addRun(index, run2, true);
+          this.addRun(index, run2);
         }
         return index;
       }
@@ -192068,13 +192070,13 @@ var init_run_store = __esm({
             agenticSessionId,
             /* @__PURE__ */ new Map([["metadata", Buffer.from(serializeRunMetadata(entry))]])
           );
-          this.indexStore.addRun(this.getIndex(), entry, true);
+          this.indexStore.addRun(this.getIndex(), entry);
           await this.persistIndex();
           return entry;
         });
       }
-      async reindexRun(run2, replaceBinding = false) {
-        this.indexStore.addRun(this.getIndex(), run2, replaceBinding);
+      async reindexRun(run2) {
+        this.indexStore.addRun(this.getIndex(), run2);
         await this.persistIndex();
       }
       updateRunStatus(runId, status) {
@@ -192245,9 +192247,7 @@ var init_run_store = __esm({
         return this.withMetadataLock(runId, async () => {
           const run2 = await readRunMetadata(this.runFamilies, runId);
           if (!run2) throw new SessionValidationError(`Unknown Run: ${runId}`);
-          if (run2.provider !== runtime.provider) {
-            throw new SessionValidationError("Implementation runtime requires a replacement Run.");
-          }
+          run2.provider = runtime.provider;
           run2.model = runtime.model;
           if (runtime.reasoningEffort === void 0) delete run2.reasoningEffort;
           else run2.reasoningEffort = runtime.reasoningEffort;
@@ -220266,10 +220266,10 @@ var init_run_read_identity = __esm({
           "The persisted Run identity does not match the requested Run."
         );
       }
-      if (!session.contextMetadata.agentSessionId) {
+      if (session.contextMetadata.agentSessionId !== runId) {
         throw new RunReadPreparationError(
           "INVALID_RUN_CONTEXT",
-          "The persisted Run is not bound to an Agent Session."
+          "The persisted Run is not bound to the requested Agent Session."
         );
       }
       try {
@@ -225184,7 +225184,6 @@ var init_agent_session_starter = __esm({
       return { ids, launchServiceId };
     };
     startAgenticSession = async ({
-      runId,
       context,
       entity,
       runStore,
@@ -225227,7 +225226,7 @@ var init_agent_session_starter = __esm({
         if (conflict) throw new SessionValidationError(conflict);
       }
       const sessionInput = {
-        agentic_session_id: runId ?? agentSessionId,
+        agentic_session_id: agentSessionId,
         entity,
         services,
         provider: context.provider ?? "claude",
@@ -232154,7 +232153,6 @@ var init_dispatch = __esm({
         provider: payload.provider
       },
       contextMetadata: payload.contextMetadata,
-      ...payload.runId !== void 0 ? { runId: payload.runId } : {},
       conversationId,
       // The turn-firing arm always carries its typed handler payload. The workflow
       // arm may be bind-only or carry `workflow_kickoff`: createRun reads the
@@ -232711,7 +232709,7 @@ var init_dispatch = __esm({
             if (claim.disposition === "MISMATCH") {
               this.dependencies.operationTimeline?.emit(operationId, "rejected", {
                 agentSessionId: payload.agentSessionId,
-                runId: payload.runId ?? payload.agentSessionId,
+                runId: payload.agentSessionId,
                 promptType: verified.body.promptType,
                 provider: payload.provider
               });
@@ -232726,7 +232724,7 @@ var init_dispatch = __esm({
               claim.state === "FAILED" ? "failed" : "no_provider_output",
               {
                 agentSessionId: payload.agentSessionId,
-                runId: payload.runId ?? payload.agentSessionId,
+                runId: payload.agentSessionId,
                 promptType: verified.body.promptType,
                 provider: payload.provider
               }
@@ -232743,6 +232741,13 @@ var init_dispatch = __esm({
               inputDisposition: "NONE"
             };
           }
+          if (payload.runId !== void 0 && payload.runId !== payload.agentSessionId) {
+            logger.warn("trigger-verification.conversation.start_run_ignored_run_id", {
+              conversationId,
+              agentSessionId: payload.agentSessionId,
+              ignoredRunId: payload.runId
+            });
+          }
           logger.info("trigger-verification.conversation.dispatch_start_run", {
             conversationId,
             handlerPromptType: payload.handlerPromptType,
@@ -232758,10 +232763,10 @@ var init_dispatch = __esm({
           try {
             const materialized = await agentService.createRunFromTrigger(capability, request2);
             if (materialized.status !== "started") {
-              throw new Error("Replacement Run workspace could not be resolved.");
+              throw new Error("Run workspace could not be resolved.");
             }
             const boundRunId = this.dependencies.runStore.lookupByConversationId(conversationId);
-            if (boundRunId !== materialized.run.agentic_session_id || materialized.run.agentic_session_id !== (payload.runId ?? payload.agentSessionId)) {
+            if (boundRunId !== materialized.run.agentic_session_id || materialized.run.agentic_session_id !== payload.agentSessionId) {
               throw new Error("Materialized Run is not bound to the conversation.");
             }
             await this.operationReceiptStore.complete(operationId, operationFingerprint, true);
@@ -232772,7 +232777,7 @@ var init_dispatch = __esm({
             );
             this.dependencies.operationTimeline?.emit(operationId, "no_provider_output", {
               agentSessionId: payload.agentSessionId,
-              runId: payload.runId ?? payload.agentSessionId,
+              runId: payload.agentSessionId,
               promptType: verified.body.promptType,
               provider: payload.provider
             });
@@ -232792,7 +232797,7 @@ var init_dispatch = __esm({
             );
             this.dependencies.operationTimeline?.emit(operationId, "failed", {
               agentSessionId: payload.agentSessionId,
-              runId: payload.runId ?? payload.agentSessionId,
+              runId: payload.agentSessionId,
               promptType: verified.body.promptType,
               provider: payload.provider
             });
@@ -235801,7 +235806,7 @@ var init_cli_read_handler = __esm({
         }
         const { body, frame } = verified;
         const run2 = await this.restoreCoordinator.restoreForContextUsage(body.runId);
-        if (run2.runId !== body.runId || body.agentSessionId !== run2.session.contextMetadata.agentSessionId || run2.organizationId !== frame.organizationId || run2.projectId !== frame.projectId || run2.conversationId !== frame.conversationId) {
+        if (run2.runId !== body.runId || body.agentSessionId !== body.runId || run2.organizationId !== frame.organizationId || run2.projectId !== frame.projectId || run2.conversationId !== frame.conversationId) {
           throw new RunReadPreparationError(
             "INVALID_RUN_CONTEXT",
             "The signed read context does not match the persisted Run."
@@ -235824,7 +235829,7 @@ var init_cli_read_handler = __esm({
         }
         const { body, frame } = verified;
         const run2 = await this.restoreCoordinator.restore(body.runId);
-        if (run2.runId !== body.runId || body.agentSessionId !== run2.session.contextMetadata.agentSessionId || run2.organizationId !== frame.organizationId || run2.projectId !== frame.projectId || run2.conversationId !== frame.conversationId) {
+        if (run2.runId !== body.runId || body.agentSessionId !== body.runId || run2.organizationId !== frame.organizationId || run2.projectId !== frame.projectId || run2.conversationId !== frame.conversationId) {
           throw new RunReadPreparationError(
             "INVALID_RUN_CONTEXT",
             "The signed read context does not match the persisted Run."
@@ -242897,7 +242902,7 @@ var init_provider_session_startup_input = __esm({
     classifyProviderSessionDecision = (args2) => {
       const hasUnownedProviderSession = args2.hasProviderSession && !args2.outgoingAgentId;
       const isAgentTransition = args2.hasProviderSession && args2.outgoingAgentId !== null && args2.outgoingAgentId !== args2.incomingAgentId;
-      const requiresExplicitFresh = args2.hasProviderSession && (args2.providerSessionStart === "fresh" || args2.preparedWorkspaceBoundaryChanged === true);
+      const requiresExplicitFresh = args2.hasProviderSession && (args2.providerSessionStart === "fresh" || args2.preparedWorkspaceBoundaryChanged === true || args2.providerSwitched === true);
       if (hasUnownedProviderSession) return "unowned-session-mint";
       if (isAgentTransition) return "agent-transition-mint";
       if (requiresExplicitFresh) return "explicit-fresh-mint";
@@ -244345,15 +244350,8 @@ var init_run_service = __esm({
           const resolvedEffort = input.reasoningEffort ?? runnerConfig.reasoningEffort;
           const requestedAgentSessionId = readNonEmptyString5(input.contextMetadata.agentSessionId);
           if (requestedAgentSessionId) {
-            const existing = await runStore.getRun(input.runId ?? requestedAgentSessionId);
+            const existing = await runStore.getRun(requestedAgentSessionId);
             if (existing) {
-              if (input.runId !== void 0 && (existing.provider !== provider || existing.contextMetadata.agentSessionId !== requestedAgentSessionId)) {
-                throw new LocalAgentApiError(
-                  "INVALID_REQUEST",
-                  "Replacement Run identity conflicts with its runtime or owner.",
-                  409
-                );
-              }
               if (!sameRunEntity(existing.entity, entity)) {
                 this.log("warn", "local.service.create_run.entity_conflict", {
                   agentSessionId: requestedAgentSessionId,
@@ -244372,7 +244370,7 @@ var init_run_service = __esm({
                 taskMonitorIdentityValidated: hasTaskMonitorIdentity,
                 fastModeSelection: existing.fastMode === void 0 ? "omitted" : existing.fastMode ? "enabled" : "disabled"
               });
-              await runStore.reindexRun(existing, input.runId !== void 0);
+              await runStore.reindexRun(existing);
               return { status: "started", run: toLocalRun(existing), created: false };
             }
           }
@@ -244388,7 +244386,6 @@ var init_run_service = __esm({
             hasWorktree: Boolean(input.worktree)
           });
           const startArgs = {
-            ...input.runId !== void 0 ? { runId: input.runId } : {},
             context: input.context,
             entity,
             contextMetadata: input.contextMetadata,
@@ -250075,6 +250072,11 @@ var init_run = __esm({
       organizationId;
       projectId;
       conversationId;
+      /**
+       * The provider serving this Run's provider sessions. An Implement runtime
+       * selection may switch it between Turns; the switch rotates the provider
+       * session inside this Run and never creates another Run.
+       */
       provider;
       session;
       hasProviderSession;
@@ -253735,7 +253737,18 @@ var init_run = __esm({
             } catch (error41) {
               this.logger.error("local.run.drain.failed", { runId: this.runId, error: error41 });
               this.clearQueue();
+              try {
+                await this.postAgentSystemMessage(
+                  "I could not start your queued message. Please try sending it again."
+                );
+              } catch (postError) {
+                this.logger.error("local.run.drain.failure_post_failed", {
+                  runId: this.runId,
+                  error: postError
+                });
+              }
               this._processing = false;
+              this.armInactivityTimerIfIdle();
               this.notifyIfDurableInputAcceptable();
             }
             return;
@@ -253834,16 +253847,19 @@ var init_run = __esm({
           );
         }
         const runtimeSession = await this.implementRuntimeOwner.apply(session, input);
+        let providerSwitched = false;
         if (runtimeSession !== session) {
           this.refreshSessionFields(runtimeSession);
           session = this.session;
+          providerSwitched = this.switchProvider(session.provider);
         }
         const providerSessionDecisionPreview = handler.runnerKind === "provider_session" && typeof handler.id === "string" && handler.id.trim().length > 0 ? classifyProviderSessionDecision({
           hasProviderSession: this.hasProviderSession,
           outgoingAgentId: this.session.provider_session_agent_id ?? null,
           incomingAgentId: handler.id,
           providerSessionStart: handler.providerSessionStart ?? "inherit",
-          ...handler.providerSessionLifetime ? { providerSessionLifetime: handler.providerSessionLifetime } : {}
+          ...handler.providerSessionLifetime ? { providerSessionLifetime: handler.providerSessionLifetime } : {},
+          providerSwitched
         }) : void 0;
         const readinessGatedInput = isImplementationReadinessGatedInput(input);
         const readinessClarification = readImplementationReadinessClarification(input);
@@ -253896,10 +253912,7 @@ var init_run = __esm({
           session = this.session;
         }
         const workspaceStartedAt = performance.now();
-        const projectModeBundleDirectory = await this.resolveProjectModeBundleDirectory(
-          session,
-          input.promptType
-        );
+        const projectModeBundleDirectory = await this.resolveProjectModeBundleDirectory(session);
         let turnWorkspace = await this.resolveTurnWorkspace(
           session,
           input.promptType,
@@ -254080,7 +254093,7 @@ var init_run = __esm({
           const providerSessionStart = handler.providerSessionStart ?? "inherit";
           const hasUnownedProviderSession = hadProviderSession && !outgoingAgentId;
           const isAgentTransition = hadProviderSession && outgoingAgentId !== null && outgoingAgentId !== incomingAgentId;
-          const requiresExplicitFresh = hadProviderSession && (providerSessionStart === "fresh" || preparedApprovedPlanWorkspaceChanged);
+          const requiresExplicitFresh = hadProviderSession && (providerSessionStart === "fresh" || preparedApprovedPlanWorkspaceChanged || providerSwitched);
           if (hasUnownedProviderSession || isAgentTransition || requiresExplicitFresh) {
             const rotationReason = hasUnownedProviderSession ? "unowned-session" : isAgentTransition ? "agent-transition" : "explicit-fresh";
             await this.discardProviderSessionForRotation({
@@ -254229,6 +254242,24 @@ var init_run = __esm({
        * incoming agent. The provider client reset is awaited so the next mint
        * cannot race a stale live SDK handle.
        */
+      /**
+       * Point this Run at a newly selected provider. The outgoing provider's
+       * client stays bound as `this.runner` until the rotation discard runs, so
+       * the outgoing session is closed by the provider that owns it.
+       */
+      switchProvider(provider) {
+        if (provider === this.provider) return false;
+        this.logger.info("local.run.provider.switched", {
+          runId: this.runId,
+          fromProvider: this.provider,
+          toProvider: provider,
+          providerSessionId: this.session.provider_session_id ?? null
+        });
+        if (this.codexShellChangeObserver) void this.codexShellChangeObserver.clearRun(this.runId);
+        this.provider = provider;
+        this.codexShellChangeObserver = provider === "codex" ? new CodexShellChangeObserver(this.logger) : null;
+        return true;
+      }
       async discardProviderSessionForRotation(input) {
         const { discardedProviderSessionId } = await this.discardProviderSession(
           `${input.reason}-discard`,
@@ -254385,12 +254416,16 @@ var init_run = __esm({
             allowedRepositoryRoots: this.workspaceWriteBoundary.allowedRepositoryRoots,
             readOnlyDirectories: this.workspaceWriteBoundary.readOnlyDirectories
           });
-        } else if (!(readOnlyDirectories.length > 0 ? this.workspaceWriteBoundary.matchesWorkspace(workspace, readOnlyDirectories) : this.workspaceWriteBoundary.matchesWorkspace(workspace))) {
-          const expectedRoots = this.workspaceWriteBoundary.allowedRepositoryRoots;
+        } else if (!this.workspaceWriteBoundary.matchesWorkspace(workspace, readOnlyDirectories)) {
           this.logger.error("local.run.workspace_write_boundary.identity_changed", {
             runId: this.runId,
-            expectedRoots,
-            resolvedRoots: workspace.allowedRepositoryRoots
+            promptType,
+            expectedCwd: this.workspaceWriteBoundary.cwd,
+            resolvedCwd: workspace.cwd,
+            expectedRoots: this.workspaceWriteBoundary.allowedRepositoryRoots,
+            resolvedRoots: workspace.allowedRepositoryRoots,
+            expectedReadOnlyDirectories: this.workspaceWriteBoundary.readOnlyDirectories,
+            resolvedReadOnlyDirectories: readOnlyDirectories
           });
           throw new LocalAgentApiError(
             "INVALID_REQUEST",
@@ -254404,8 +254439,12 @@ var init_run = __esm({
           workspaceWriteBoundary: this.workspaceWriteBoundary
         };
       }
-      async resolveProjectModeBundleDirectory(session, promptType) {
-        if (promptType !== LocalPromptType.ProjectMode) return null;
+      /**
+       * The bundle is Run-scoped: every Turn of a mode-backed Run passes it as a
+       * read-only directory so the write boundary identity stays stable.
+       */
+      async resolveProjectModeBundleDirectory(session) {
+        if (!hasCapturedProjectModeConfig(session.config)) return null;
         const validated = validateProjectModeConfig(session.config);
         if (!validated.ok) {
           this.logger.error("local.run.project_mode_bundle.invalid_captured_config", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hey-hey/cli",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "description": "Hey Hey Agent Bridge — a local CLI that runs agent coding sessions and bridges the Hey Hey platform with Claude Code.",
   "main": "dist/index.js",
   "bin": {