@cnwenf/occ 2.1.255 → 2.1.257

package/dist/cli.js

@@ -57636,14 +57636,10 @@ var init_env = __esm(() => {
   init_which();
   getGlobalClaudeFile = memoize_default(() => {
     if (getFsImplementation().existsSync(join16(getClaudeConfigHomeDir(), ".config.json"))) {
-      process.stderr.write(`[DIAGCFG] getGlobalClaudeFile -> legacy .config.json at ${join16(getClaudeConfigHomeDir(), ".config.json")}
-`);
       return join16(getClaudeConfigHomeDir(), ".config.json");
     }
     const filename = `.claude${fileSuffixForOauthConfig()}.json`;
     const p = join16(process.env.CLAUDE_CONFIG_DIR || homedir7(), filename);
-    process.stderr.write(`[DIAGCFG] getGlobalClaudeFile -> ${p} (homedir=${homedir7()} CLAUDE_CONFIG_DIR=${process.env.CLAUDE_CONFIG_DIR ?? "unset"})
-`);
     return p;
   });
   hasInternetAccess = memoize_default(async () => {
@@ -271279,6 +271275,19 @@ var init_sdkEventQueue = __esm(() => {
 });
 
 // src/utils/task/framework.ts
+var exports_framework = {};
+__export(exports_framework, {
+  updateTaskState: () => updateTaskState,
+  registerTask: () => registerTask,
+  pollTasks: () => pollTasks,
+  getRunningTasks: () => getRunningTasks,
+  generateTaskAttachments: () => generateTaskAttachments,
+  evictTerminalTask: () => evictTerminalTask,
+  applyTaskOffsetsAndEvictions: () => applyTaskOffsetsAndEvictions,
+  STOPPED_DISPLAY_MS: () => STOPPED_DISPLAY_MS,
+  POLL_INTERVAL_MS: () => POLL_INTERVAL_MS2,
+  PANEL_GRACE_MS: () => PANEL_GRACE_MS
+});
 function updateTaskState(taskId, setAppState, updater) {
   setAppState((prev) => {
     const task = prev.tasks?.[taskId];
@@ -271403,7 +271412,43 @@ function applyTaskOffsetsAndEvictions(setAppState, updatedTaskOffsets, evictedTa
     return changed ? { ...prev, tasks: newTasks } : prev;
   });
 }
-var STOPPED_DISPLAY_MS = 3000, PANEL_GRACE_MS = 30000;
+async function pollTasks(getAppState, setAppState) {
+  const state3 = getAppState();
+  const { attachments, updatedTaskOffsets, evictedTaskIds } = await generateTaskAttachments(state3);
+  applyTaskOffsetsAndEvictions(setAppState, updatedTaskOffsets, evictedTaskIds);
+  for (const attachment of attachments) {
+    enqueueTaskNotification(attachment);
+  }
+}
+function enqueueTaskNotification(attachment) {
+  const statusText = getStatusText(attachment.status);
+  const outputPath = getTaskOutputPath(attachment.taskId);
+  const toolUseIdLine = attachment.toolUseId ? `
+<${TOOL_USE_ID_TAG}>${attachment.toolUseId}</${TOOL_USE_ID_TAG}>` : "";
+  const message = `<${TASK_NOTIFICATION_TAG}>
+<${TASK_ID_TAG}>${attachment.taskId}</${TASK_ID_TAG}>${toolUseIdLine}
+<${TASK_TYPE_TAG}>${attachment.taskType}</${TASK_TYPE_TAG}>
+<${OUTPUT_FILE_TAG}>${outputPath}</${OUTPUT_FILE_TAG}>
+<${STATUS_TAG}>${attachment.status}</${STATUS_TAG}>
+<${SUMMARY_TAG}>Task "${attachment.description}" ${statusText}</${SUMMARY_TAG}>
+</${TASK_NOTIFICATION_TAG}>`;
+  enqueuePendingNotification({ value: message, mode: "task-notification" });
+}
+function getStatusText(status) {
+  switch (status) {
+    case "completed":
+      return "completed successfully";
+    case "failed":
+      return "failed";
+    case "killed":
+      return "was stopped";
+    case "running":
+      return "is running";
+    case "pending":
+      return "is pending";
+  }
+}
+var POLL_INTERVAL_MS2 = 1000, STOPPED_DISPLAY_MS = 3000, PANEL_GRACE_MS = 30000;
 var init_framework = __esm(() => {
   init_xml();
   init_Task();
@@ -396192,7 +396237,7 @@ function AgentProgressLine(t0) {
   } else {
     t32 = $3[4];
   }
-  const getStatusText = t32;
+  const getStatusText2 = t32;
   let t4;
   if ($3[5] !== treeChar) {
     t4 = /* @__PURE__ */ jsx_dev_runtime52.jsxDEV(ThemedText, {
@@ -396311,7 +396356,7 @@ function AgentProgressLine(t0) {
     t9 = $3[24];
   }
   let t10;
-  if ($3[25] !== getStatusText || $3[26] !== isBackgrounded || $3[27] !== isLast) {
+  if ($3[25] !== getStatusText2 || $3[26] !== isBackgrounded || $3[27] !== isLast) {
     t10 = !isBackgrounded && /* @__PURE__ */ jsx_dev_runtime52.jsxDEV(ThemedBox_default, {
       paddingLeft: 3,
       flexDirection: "row",
@@ -396322,11 +396367,11 @@ function AgentProgressLine(t0) {
         }, undefined, false, undefined, this),
         /* @__PURE__ */ jsx_dev_runtime52.jsxDEV(ThemedText, {
           dimColor: true,
-          children: getStatusText()
+          children: getStatusText2()
         }, undefined, false, undefined, this)
       ]
     }, undefined, true, undefined, this);
-    $3[25] = getStatusText;
+    $3[25] = getStatusText2;
     $3[26] = isBackgrounded;
     $3[27] = isLast;
     $3[28] = t10;
@@ -459192,7 +459237,7 @@ async function tryClaimNextTask(taskListId, agentName) {
   }
 }
 async function waitForNextPromptOrShutdown(identity8, abortController, taskId, getAppState, setAppState, taskListId) {
-  const POLL_INTERVAL_MS2 = 500;
+  const POLL_INTERVAL_MS3 = 500;
   logForDebugging(`[inProcessRunner] ${identity8.agentName} starting poll loop (abort=${abortController.signal.aborted})`);
   let pollCount = 0;
   while (!abortController.signal.aborted) {
@@ -459224,7 +459269,7 @@ async function waitForNextPromptOrShutdown(identity8, abortController, taskId, g
       };
     }
     if (pollCount > 0) {
-      await sleep3(POLL_INTERVAL_MS2);
+      await sleep3(POLL_INTERVAL_MS3);
     }
     pollCount++;
     if (abortController.signal.aborted) {
@@ -475593,6 +475638,7 @@ async function* runAgent({
   override,
   model,
   maxTurns,
+  subagentDepth,
   preserveToolUseResults,
   availableTools,
   allowedTools,
@@ -479942,7 +479988,7 @@ async function restoreRemoteAgentTasksImpl(context6) {
 }
 function startRemoteSessionPolling(taskId, context6) {
   let isRunning = true;
-  const POLL_INTERVAL_MS2 = 1000;
+  const POLL_INTERVAL_MS3 = 1000;
   const REMOTE_REVIEW_TIMEOUT_MS = 30 * 60 * 1000;
   const STABLE_IDLE_POLLS = 5;
   let consecutiveIdlePolls = 0;
@@ -480107,7 +480153,7 @@ function startRemoteSessionPolling(taskId, context6) {
       } catch {}
     }
     if (isRunning) {
-      setTimeout(poll, POLL_INTERVAL_MS2);
+      setTimeout(poll, POLL_INTERVAL_MS3);
     }
   };
   poll();
@@ -481627,10 +481673,10 @@ var init_AgentTool = __esm(() => {
         let currentAppState = appState;
         if (hasPendingRequiredServers) {
           const MAX_WAIT_MS = 30000;
-          const POLL_INTERVAL_MS2 = 500;
+          const POLL_INTERVAL_MS3 = 500;
           const deadline = Date.now() + MAX_WAIT_MS;
           while (Date.now() < deadline) {
-            await sleep3(POLL_INTERVAL_MS2);
+            await sleep3(POLL_INTERVAL_MS3);
             currentAppState = toolUseContext.getAppState();
             const hasFailedRequiredServer = currentAppState.mcp.clients.some((c9) => c9.type === "failed" && requiredMcpServers.some((pattern) => c9.name.toLowerCase().includes(pattern.toLowerCase())));
             if (hasFailedRequiredServer)
@@ -512427,6 +512473,7 @@ You MUST call the ${SYNTHETIC_OUTPUT_TOOL_NAME} tool exactly once at the end of
       canShowPermissionPrompts: false,
       querySource: "workflow",
       model: opts.model,
+      subagentDepth: (ctx.toolUseContext.subagentDepth ?? 0) + 1,
       maxTurns: opts.schema ? 30 : undefined,
       availableTools: ctx.availableTools,
       worktreePath,
@@ -615207,7 +615254,7 @@ async function pollForApprovedExitPlanMode(sessionId, timeoutMs, onPhaseChange,
       if (!transient || ++failures >= MAX_CONSECUTIVE_FAILURES) {
         throw new UltraplanPollError(e4 instanceof Error ? e4.message : String(e4), "network_or_unknown", scanner.rejectCount, { cause: e4 });
       }
-      await sleep3(POLL_INTERVAL_MS2);
+      await sleep3(POLL_INTERVAL_MS3);
       continue;
     }
     let result;
@@ -615240,7 +615287,7 @@ async function pollForApprovedExitPlanMode(sessionId, timeoutMs, onPhaseChange,
       lastPhase = phase;
       onPhaseChange?.(phase);
     }
-    await sleep3(POLL_INTERVAL_MS2);
+    await sleep3(POLL_INTERVAL_MS3);
   }
   throw new UltraplanPollError(scanner.everSeenPending ? `no approval after ${timeoutMs / 1000}s` : `ExitPlanMode never reached after ${timeoutMs / 1000}s (the remote container failed to start, or session ID mismatch?)`, scanner.everSeenPending ? "timeout_pending" : "timeout_no_plan", scanner.rejectCount);
 }
@@ -615272,7 +615319,7 @@ function extractApprovedPlan(content) {
   }
   throw new Error(`ExitPlanMode approved but tool_result has no "## Approved Plan:" marker \u2014 remote may have hit the empty-plan or isAgent branch. Content preview: ${text2.slice(0, 200)}`);
 }
-var POLL_INTERVAL_MS2 = 3000, MAX_CONSECUTIVE_FAILURES = 5, UltraplanPollError, ULTRAPLAN_TELEPORT_SENTINEL = "__ULTRAPLAN_TELEPORT_LOCAL__";
+var POLL_INTERVAL_MS3 = 3000, MAX_CONSECUTIVE_FAILURES = 5, UltraplanPollError, ULTRAPLAN_TELEPORT_SENTINEL = "__ULTRAPLAN_TELEPORT_LOCAL__";
 var init_ccrSession = __esm(() => {
   init_debug();
   init_api2();
@@ -690179,14 +690226,14 @@ function usePrStatus(isLoading, enabled2 = true) {
         return;
       }
       if (!cancelled) {
-        timeoutRef.current = setTimeout(poll, POLL_INTERVAL_MS3);
+        timeoutRef.current = setTimeout(poll, POLL_INTERVAL_MS4);
       }
     }
     const elapsed = Date.now() - lastFetchRef.current;
-    if (elapsed >= POLL_INTERVAL_MS3) {
+    if (elapsed >= POLL_INTERVAL_MS4) {
       poll();
     } else {
-      timeoutRef.current = setTimeout(poll, POLL_INTERVAL_MS3 - elapsed);
+      timeoutRef.current = setTimeout(poll, POLL_INTERVAL_MS4 - elapsed);
     }
     return () => {
       cancelled = true;
@@ -690198,7 +690245,7 @@ function usePrStatus(isLoading, enabled2 = true) {
   }, [isLoading, enabled2]);
   return prStatus;
 }
-var import_react248, POLL_INTERVAL_MS3 = 60000, SLOW_GH_THRESHOLD_MS = 4000, IDLE_STOP_MS, INITIAL_STATE4;
+var import_react248, POLL_INTERVAL_MS4 = 60000, SLOW_GH_THRESHOLD_MS = 4000, IDLE_STOP_MS, INITIAL_STATE4;
 var init_usePrStatus = __esm(() => {
   init_state();
   init_ghPrStatus();
@@ -717771,9 +717818,25 @@ function FleetViewScreen(props) {
     const id = setInterval(() => setNow(Date.now()), 1000);
     return () => clearInterval(id);
   }, []);
+  React150.useEffect(() => {
+    const id = setInterval(() => {
+      for (const task of Object.values(tasks2)) {
+        if (task.status === "running" && task.pid) {
+          try {
+            const { writeFileSync: writeFileSync13 } = __require("fs");
+            const { join: join173 } = __require("path");
+            const heartbeatPath = join173(__require("os").tmpdir(), `.fleetview-heartbeat-${task.pid}`);
+            writeFileSync13(heartbeatPath, String(Date.now()));
+          } catch {}
+        }
+      }
+    }, 5000);
+    return () => clearInterval(id);
+  }, [tasks2]);
   const [fleetActive, setFleetActive] = React150.useState(false);
   const [selectedIndex, setSelectedIndex] = React150.useState(0);
   const [showPreview, setShowPreview] = React150.useState(false);
+  const [groupMode, setGroupMode] = React150.useState("state");
   const fleetRows = React150.useMemo(() => buildFleetRows(tasks2, now2), [tasks2, now2]);
   const hasJobs = fleetRows.running.length > 0 || fleetRows.done.length > 0;
   React150.useEffect(() => {
@@ -717828,6 +717891,19 @@ function FleetViewScreen(props) {
       }
       return;
     }
+    if (input === "g" && key3.ctrl) {
+      event.stopImmediatePropagation();
+      setGroupMode((m5) => m5 === "state" ? "group" : "state");
+      return;
+    }
+    if (input === "x" && fleetRows.running[selectedIndex]) {
+      event.stopImmediatePropagation();
+      const task = fleetRows.running[selectedIndex];
+      try {
+        (init_framework(), __toCommonJS(exports_framework)).updateTaskState(task.id, { status: "killed" });
+      } catch {}
+      return;
+    }
   }, { isActive: !disabled && (hasJobs || fleetActive) });
   if (!isAgentsFleetEnabled())
     return null;
@@ -735419,7 +735495,7 @@ function runHeadlessStreaming(structuredIO, mcpClients, commands7, tools, initia
       const teamContext = currentAppState.teamContext;
       if (teamContext && isTeamLead(teamContext)) {
         const agentName = "team-lead";
-        const POLL_INTERVAL_MS4 = 500;
+        const POLL_INTERVAL_MS5 = 500;
         while (true) {
           const refreshedState = getAppState();
           const hasActiveTeammates = hasActiveInProcessTeammates(refreshedState) || refreshedState.teamContext && Object.keys(refreshedState.teamContext.teammates).length > 0;
@@ -735486,7 +735562,7 @@ ${m5.text}
             run();
             return;
           }
-          await sleep3(POLL_INTERVAL_MS4);
+          await sleep3(POLL_INTERVAL_MS5);
         }
       }
     }
@@ -740782,54 +740858,26 @@ async function logStartupTelemetry() {
   });
 }
 function runMigrations() {
-  process.stderr.write(`[DIAG5] runMigrations entry
-`);
   if (getGlobalConfig().migrationVersion !== CURRENT_MIGRATION_VERSION) {
-    process.stderr.write(`[DIAG5] before migrateAutoUpdates
-`);
     migrateAutoUpdatesToSettings();
-    process.stderr.write(`[DIAG5] before migrateBypass
-`);
     migrateBypassPermissionsAcceptedToSettings();
-    process.stderr.write(`[DIAG5] before migrateEnableAllMcp
-`);
     migrateEnableAllProjectMcpServersToSettings();
-    process.stderr.write(`[DIAG5] before resetPro
-`);
     resetProToOpusDefault();
-    process.stderr.write(`[DIAG5] before migrateSonnet1m
-`);
     migrateSonnet1mToSonnet45();
-    process.stderr.write(`[DIAG5] before migrateLegacyOpus
-`);
     migrateLegacyOpusToCurrent();
-    process.stderr.write(`[DIAG5] before migrateSonnet45
-`);
     migrateSonnet45ToSonnet46();
-    process.stderr.write(`[DIAG5] before migrateOpus1m
-`);
     migrateOpusToOpus1m();
-    process.stderr.write(`[DIAG5] before migrateReplBridge
-`);
     migrateReplBridgeEnabledToRemoteControlAtStartup();
     if (feature("TRANSCRIPT_CLASSIFIER")) {
       resetAutoModeOptInForDefaultOffer();
     }
     if (false) {}
-    process.stderr.write(`[DIAG5] before saveGlobalConfig
-`);
     saveGlobalConfig((prev) => prev.migrationVersion === CURRENT_MIGRATION_VERSION ? prev : {
       ...prev,
       migrationVersion: CURRENT_MIGRATION_VERSION
     });
-    process.stderr.write(`[DIAG5] after saveGlobalConfig
-`);
   }
-  process.stderr.write(`[DIAG5] before migrateChangelog
-`);
   migrateChangelogFromConfig().catch(() => {});
-  process.stderr.write(`[DIAG5] runMigrations exit
-`);
 }
 function prefetchSystemContextIfSafe() {
   const isNonInteractiveSession = getIsNonInteractiveSession();
@@ -741213,17 +741261,11 @@ async function run() {
     initSinks2();
     profileCheckpoint("preAction_after_sinks");
     const pluginDir = thisCommand.getOptionValue("pluginDir");
-    process.stderr.write(`[DIAG4] before pluginDir check
-`);
     if (Array.isArray(pluginDir) && pluginDir.length > 0 && pluginDir.every((p4) => typeof p4 === "string")) {
       setInlinePlugins(pluginDir);
       clearPluginCache("preAction: --plugin-dir inline plugins");
     }
-    process.stderr.write(`[DIAG4] before runMigrations
-`);
     runMigrations();
-    process.stderr.write(`[DIAG4] after runMigrations
-`);
     profileCheckpoint("preAction_after_migrations");
     if (getSettingsForSource("policySettings")?.forceRemoteSettingsRefresh) {
       const result = await forceRefreshRemoteManagedSettingsOrFailClosed();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cnwenf/occ",
-  "version": "2.1.255",
+  "version": "2.1.257",
   "license": "MIT",
   "type": "module",
   "bin": {