@linzumi/cli 0.0.71-beta → 0.0.72-beta

package/README.md

@@ -58,7 +58,7 @@ Install the CLI or run it with `npx`:
 ```bash
 npm install -g @linzumi/cli@latest
 npx -y @linzumi/cli@latest signup
-npx -y @linzumi/cli@0.0.71-beta --version
+npx -y @linzumi/cli@0.0.72-beta --version
 linzumi --version
 ```
 

package/dist/index.js

@@ -4069,7 +4069,10 @@ async function handleChannelSessionControl(args, state, payloadContext, control)
         interruptedActiveSeq,
         {
           status: "processed"
-        }
+        },
+        void 0,
+        void 0,
+        state.codexThreadId
       );
       break;
     case "starting":
@@ -4093,10 +4096,18 @@ async function handleChannelSessionControl(args, state, payloadContext, control)
   });
   if (interrupted.ok) {
     for (const seq of interrupted.selectedSeqs) {
-      await publishMessageState(args, state.kandanThreadId, seq, {
-        status: "processing",
-        reason: "interrupt requested"
-      });
+      await publishMessageState(
+        args,
+        state.kandanThreadId,
+        seq,
+        {
+          status: "processing",
+          reason: "interrupt requested"
+        },
+        void 0,
+        void 0,
+        state.codexThreadId
+      );
     }
   }
   await drainKandanMessageQueue(args, state, payloadContext);
@@ -4365,6 +4376,9 @@ async function resolvePendingPortForwardRequest(args, state, payloadContext, con
   if (request === void 0) {
     return void 0;
   }
+  if (control.threadId !== void 0 && state.codexThreadId !== control.threadId) {
+    return void 0;
+  }
   if (!portForwardControlSenderAllowed(args, payloadContext, control)) {
     args.log("port_forward.request_resolution_ignored", {
       request_id: control.requestId,
@@ -4633,11 +4647,19 @@ async function publishPortForwardPrompt(args, state, payloadContext, candidate)
       allowedActorUserId: args.options.channelSession.listenUser.toLowerCase() === (payloadContext.runnerIdentity.actorUsername ?? "").toLowerCase() ? payloadContext.runnerIdentity.actorUserId : void 0
     }
   };
-  await publishMessageState(args, state.kandanThreadId, sourceSeq, {
-    status: "processing",
-    reason: "awaiting approval",
-    approval: state.activeProcessingState.approval
-  });
+  await publishMessageState(
+    args,
+    state.kandanThreadId,
+    sourceSeq,
+    {
+      status: "processing",
+      reason: "awaiting approval",
+      approval: state.activeProcessingState.approval
+    },
+    void 0,
+    void 0,
+    state.codexThreadId
+  );
   await publishForwardPortRequestedEvent(args, state, request, processIdentity);
   args.log("port_forward.request_pending", {
     request_id: requestId,
@@ -4826,7 +4848,10 @@ async function publishMessageStateForPortForwardResult(args, state, request, sta
               {
                 status: "processing",
                 reason: "running terminal command"
-              }
+              },
+              void 0,
+              void 0,
+              state.codexThreadId
             );
             return;
           }
@@ -4851,15 +4876,31 @@ async function publishMessageStateForPortForwardResult(args, state, request, sta
   }
   switch (status) {
     case "processed":
-      await publishMessageState(args, state.kandanThreadId, request.sourceSeq, {
-        status: "processed"
-      });
+      await publishMessageState(
+        args,
+        state.kandanThreadId,
+        request.sourceSeq,
+        {
+          status: "processed"
+        },
+        void 0,
+        void 0,
+        state.codexThreadId
+      );
       break;
     case "failed":
-      await publishMessageState(args, state.kandanThreadId, request.sourceSeq, {
-        status: "failed",
-        reason: failedReason
-      });
+      await publishMessageState(
+        args,
+        state.kandanThreadId,
+        request.sourceSeq,
+        {
+          status: "failed",
+          reason: failedReason
+        },
+        void 0,
+        void 0,
+        state.codexThreadId
+      );
       break;
   }
 }
@@ -5239,9 +5280,17 @@ async function drainKandanMessageQueue(args, state, payloadContext) {
       state.turn = { status: "idle" };
       clearActiveProcessingState(state, next.seq);
       if (state.kandanThreadId !== void 0) {
-        await publishMessageState(args, state.kandanThreadId, next.seq, {
-          status: "processed"
-        });
+        await publishMessageState(
+          args,
+          state.kandanThreadId,
+          next.seq,
+          {
+            status: "processed"
+          },
+          void 0,
+          void 0,
+          state.codexThreadId
+        );
       }
       await drainKandanMessageQueue(args, state, payloadContext);
     }
@@ -7755,7 +7804,9 @@ async function stopCodexTyping(args, state) {
     {
       workspace: session.workspaceSlug,
       channel: session.channelSlug,
-      thread_id: state.kandanThreadId
+      thread_id: state.kandanThreadId,
+      instance_id: args.instanceId,
+      codex_thread_id: state.codexThreadId ?? null
     },
     args.log
   );
@@ -7774,7 +7825,9 @@ function startCodexTypingHeartbeat(args, state, threadId) {
       {
         workspace: session.workspaceSlug,
         channel: session.channelSlug,
-        thread_id: threadId
+        thread_id: threadId,
+        instance_id: args.instanceId,
+        codex_thread_id: state.codexThreadId ?? null
       },
       args.log
     ).then(() => refreshActiveProcessingHeartbeat(args, state)).catch((error) => {
@@ -7819,7 +7872,8 @@ async function publishQueuedMessageState(args, state, message, messageState) {
     message.seq,
     messageState,
     message.actorSlug,
-    message.actorUserId
+    message.actorUserId,
+    state.codexThreadId
   );
 }
 async function publishMessageState(args, threadId, seq, state, actorSlug, actorUserId, codexThreadId) {
@@ -7828,6 +7882,7 @@ async function publishMessageState(args, threadId, seq, state, actorSlug, actorU
     workspace: session.workspaceSlug,
     channel: session.channelSlug,
     thread_id: threadId,
+    instance_id: args.instanceId,
     ...codexThreadId === void 0 ? {} : { codex_thread_id: codexThreadId },
     seq,
     status: state.status,
@@ -7881,10 +7936,18 @@ async function failActiveCodexTurn(args, state, turnId, reason, payloadContext)
   }
   const seq = activeQueuedSeqForTurn(state.turn, turnId);
   if (seq !== void 0 && state.kandanThreadId !== void 0) {
-    await publishMessageState(args, state.kandanThreadId, seq, {
-      status: "failed",
-      reason
-    });
+    await publishMessageState(
+      args,
+      state.kandanThreadId,
+      seq,
+      {
+        status: "failed",
+        reason
+      },
+      void 0,
+      void 0,
+      state.codexThreadId
+    );
     clearActiveProcessingState(state, seq);
   }
   forgetLocalTuiTurnId(state, turnId);
@@ -7907,10 +7970,18 @@ async function refreshActiveProcessingState(args, state, turnId, reason) {
     return;
   }
   state.activeProcessingState = { seq, reason };
-  await publishMessageState(args, state.kandanThreadId, seq, {
-    status: "processing",
-    reason
-  });
+  await publishMessageState(
+    args,
+    state.kandanThreadId,
+    seq,
+    {
+      status: "processing",
+      reason
+    },
+    void 0,
+    void 0,
+    state.codexThreadId
+  );
 }
 async function refreshActiveProcessingHeartbeat(args, state) {
   const activeProcessingState = state.activeProcessingState;
@@ -13351,7 +13422,7 @@ var linzumiCliVersion, linzumiCliVersionText;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    linzumiCliVersion = "0.0.71-beta";
+    linzumiCliVersion = "0.0.72-beta";
     linzumiCliVersionText = `linzumi ${linzumiCliVersion}`;
   }
 });
@@ -15536,7 +15607,7 @@ async function openLocalCodexRunner(options, log, cleanup, close) {
     if (workspaceSlug === void 0 || channelSlug === void 0 || kandanThreadId === void 0) {
       return void 0;
     }
-    const existingSession = dynamicChannelSessions.get(kandanThreadId);
+    const existingSession = dynamicChannelSessions.get(codexThreadId);
     if (existingSession !== void 0) {
       return existingSession;
     }
@@ -15599,7 +15670,7 @@ async function openLocalCodexRunner(options, log, cleanup, close) {
       },
       log
     });
-    dynamicChannelSessions.set(kandanThreadId, session);
+    dynamicChannelSessions.set(codexThreadId, session);
     if (sessionCodex !== codex) {
       sessionCodex.onNotification((notification) => {
         seq.value += 1;
@@ -16170,13 +16241,35 @@ function controlThreadId(control) {
 async function resolveSessionControl(channelSession, dynamicChannelSessions, control) {
   const targetThreadId = controlThreadId(control);
   if (targetThreadId !== void 0) {
-    const targetDynamicSession = dynamicChannelSessions.get(targetThreadId);
+    const directDynamicSession = dynamicChannelSessions.get(targetThreadId);
+    const targetDynamicSessions = Array.from(
+      /* @__PURE__ */ new Set([
+        ...directDynamicSession === void 0 ? [] : [directDynamicSession],
+        ...Array.from(dynamicChannelSessions.values()).filter(
+          (session) => session.currentKandanThreadId() === targetThreadId
+        )
+      ])
+    );
     const targetSessions = [
       ...channelSession?.currentKandanThreadId() === targetThreadId ? [channelSession] : [],
-      ...targetDynamicSession !== void 0 && targetDynamicSession !== channelSession ? [targetDynamicSession] : []
+      ...targetDynamicSessions.filter((session) => session !== channelSession)
     ].filter(
       (session) => session !== void 0
     );
+    if (control.type === "update_thread_interaction_access") {
+      let firstHandled;
+      let firstOk;
+      for (const session of targetSessions) {
+        const handled = await session.handleControl(control);
+        if (handled !== void 0) {
+          firstHandled ??= handled;
+          if (handled.ok === true) {
+            firstOk ??= handled;
+          }
+        }
+      }
+      return firstOk ?? firstHandled;
+    }
     for (const session of targetSessions) {
       const handled = await session.handleControl(control);
       if (handled !== void 0) {
@@ -16430,7 +16523,8 @@ async function applyControl(codex, kandan, topic, instanceId, options, agentProv
             topic,
             control,
             cwd.reason,
-            allowedCwds.value
+            allowedCwds.value,
+            { instanceId }
           );
         } catch (error) {
           log("kandan.start_instance_cwd_failed_state_push_failed", {
@@ -16454,7 +16548,8 @@ async function applyControl(codex, kandan, topic, instanceId, options, agentProv
             topic,
             control,
             "failed",
-            startInstanceUnavailableReason(agentProvider)
+            startInstanceUnavailableReason(agentProvider),
+            { instanceId }
           );
         } catch (error) {
           log("kandan.start_instance_unavailable_state_push_failed", {
@@ -16472,7 +16567,8 @@ async function applyControl(codex, kandan, topic, instanceId, options, agentProv
       const processingStatePayload = startInstanceMessageStatePayload(
         control,
         "processing",
-        `starting ${startInstanceAgentLabel(agentProvider)} session`
+        `starting ${startInstanceAgentLabel(agentProvider)} session`,
+        { instanceId }
       );
       if (processingStatePayload !== void 0) {
         void kandan.push(topic, "message_state", processingStatePayload).catch((error) => {
@@ -16542,7 +16638,7 @@ async function applyControl(codex, kandan, topic, instanceId, options, agentProv
             control,
             "failed",
             failureReason,
-            { codexThreadId: startedCodexThreadId }
+            { codexThreadId: startedCodexThreadId, instanceId }
           );
         } catch (_publishError) {
         }
@@ -16560,7 +16656,8 @@ async function applyControl(codex, kandan, topic, instanceId, options, agentProv
             topic,
             control,
             cwd.reason,
-            allowedCwds.value
+            allowedCwds.value,
+            { instanceId }
           );
         } catch (error) {
           log("kandan.reconnect_thread_cwd_failed_state_push_failed", {
@@ -16596,7 +16693,8 @@ async function applyControl(codex, kandan, topic, instanceId, options, agentProv
             topic,
             control,
             "failed",
-            startInstanceUnavailableReason(agentProvider)
+            startInstanceUnavailableReason(agentProvider),
+            { instanceId }
           );
         } catch (error) {
           log("kandan.reconnect_thread_unavailable_state_push_failed", {
@@ -16635,7 +16733,8 @@ async function applyControl(codex, kandan, topic, instanceId, options, agentProv
           const processingStatePayload = startInstanceMessageStatePayload(
             control,
             "processing",
-            "queued Claude Code input"
+            "queued Claude Code input",
+            { instanceId, codexThreadId }
           );
           if (processingStatePayload !== void 0) {
             void kandan.push(topic, "message_state", processingStatePayload).catch((error) => {
@@ -16670,7 +16769,8 @@ async function applyControl(codex, kandan, topic, instanceId, options, agentProv
                 topic,
                 control,
                 "failed",
-                reason
+                reason,
+                { instanceId, codexThreadId }
               );
             } catch (error) {
               log("kandan.reconnect_thread_queue_failed_state_push_failed", {
@@ -16700,7 +16800,8 @@ async function applyControl(codex, kandan, topic, instanceId, options, agentProv
                 topic,
                 control,
                 "failed",
-                reason
+                reason,
+                { instanceId, codexThreadId }
               );
             } catch (pushError) {
               log("kandan.reconnect_thread_queue_closed_state_push_failed", {
@@ -16739,7 +16840,8 @@ async function applyControl(codex, kandan, topic, instanceId, options, agentProv
           const processingStatePayload = startInstanceMessageStatePayload(
             control,
             "processing",
-            "resuming Claude Code session"
+            "resuming Claude Code session",
+            { instanceId, codexThreadId }
           );
           if (processingStatePayload !== void 0) {
             void kandan.push(topic, "message_state", processingStatePayload).catch((error) => {
@@ -16785,7 +16887,7 @@ async function applyControl(codex, kandan, topic, instanceId, options, agentProv
               control,
               "failed",
               failureReason,
-              { codexThreadId }
+              { codexThreadId, instanceId }
             );
           } catch (_publishError) {
           }
@@ -17536,7 +17638,8 @@ async function startClaudeCodeProviderInstance(args) {
         args.topic,
         args.control,
         "failed",
-        reason
+        reason,
+        { instanceId: args.instanceId }
       );
     } catch (error) {
       args.log(
@@ -18361,7 +18464,7 @@ async function publishStartInstanceMessageState(kandan, topic, control, status,
   }
   await kandan.push(topic, "message_state", payload);
 }
-async function publishStartInstanceCwdFailureMessageState(kandan, topic, control, reason, allowedCwds) {
+async function publishStartInstanceCwdFailureMessageState(kandan, topic, control, reason, allowedCwds, diagnostics = {}) {
   const rootSeq = integerValue(control.rootSeq);
   const sourceSeq = integerValue(control.sourceSeq) ?? rootSeq;
   if (sourceSeq === void 0) {
@@ -18377,6 +18480,7 @@ async function publishStartInstanceCwdFailureMessageState(kandan, topic, control
     workspace,
     channel,
     thread_id: threadId,
+    ...diagnostics.instanceId === void 0 ? {} : { instance_id: diagnostics.instanceId },
     seq: sourceSeq,
     status: "failed",
     reason,
@@ -18414,6 +18518,7 @@ function startInstanceMessageStatePayload(control, status, reason, diagnostics =
     workspace,
     channel,
     thread_id: threadId,
+    ...diagnostics.instanceId === void 0 ? {} : { instance_id: diagnostics.instanceId },
     seq: sourceSeq,
     status,
     reason,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@linzumi/cli",
-  "version": "0.0.71-beta",
+  "version": "0.0.72-beta",
   "description": "Linzumi CLI — point a Codex agent at the real code on your laptop, with your team watching and steering from shared threads.",
   "type": "module",
   "bin": {