@myagentroam/marctl 0.10.11 → 0.10.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/marctl",
-  "version": "0.10.11",
+  "version": "0.10.12",
   "description": "MyAgentRoam command-line interface for authorized Node access.",
   "license": "Apache-2.0",
   "type": "module",

package/src/cli.mjs

@@ -110,6 +110,7 @@ export async function main(
         ...(error.runId === undefined ? {} : { runId: error.runId }),
         ...(error.stage === undefined ? {} : { stage: error.stage }),
         ...(error.upstreamCode === undefined ? {} : { upstreamCode: error.upstreamCode }),
+        ...(error.progress === undefined ? {} : { progress: error.progress }),
         ...(error.clientMessageId === undefined ? {} : { clientMessageId: error.clientMessageId })
       };
       if (args?.json === true || (args === undefined && argv.includes('--json')))
@@ -117,6 +118,8 @@ export async function main(
       else {
         writeLine(stderr, program + ': ' + failure.message + ' [' + failure.code + ']');
         if (failure.details !== undefined) writeLine(stderr, failure.details);
+        if (failure.progress !== undefined)
+          writeLine(stderr, JSON.stringify({ progress: failure.progress }, null, 2));
       }
       return sessionExitCode(error);
     }

package/src/i18n/en-US.mjs

@@ -102,9 +102,11 @@ Titles and scheduled tasks:
   Read the current revision before updating; a version conflict is not retried.
 
 Reading JSON:
-  show: session.activity, session.model, session.effort,
-    session.customTitle / session.runnerTitle, runs[] (id/status),
-    queue.items[], goal.status (goal may be null).
+  list: id/title/runner/status/runId and one latestActivity per Session.
+  show: session.status, session.title, session.runId,
+    session.model, session.effort, session.queuedCount,
+    session.latestMessage, session.recentTools (up to three summaries).
+  Status is RUNNING/IDLE/SLEEPING; tools keep their original states.
   history: segments[].items[]; select kind === "assistant_message",
     read payload.text.
 
@@ -122,6 +124,7 @@ Delivery and waiting:
   A queued runId may identify another
   active input: correlate queueItemId/clientMessageId with visible history.
   Wait observes the specified Run through Watch. Timeout does not stop it;
+  timeout errors may include progress, the last observed bounded snapshot.
   Run success is not proof of task success.
   Completion never wakes a Coordinator.
   On an unknown delivery outcome, inspect state/history; do not blindly resend.

package/src/i18n/zh-CN.mjs

@@ -99,9 +99,11 @@ ${configurationHelp}
   更新前读取当前 revision；版本冲突不会自动重试。
 
 读取 JSON：
-  show：session.activity、session.model、session.effort、
-    session.customTitle / session.runnerTitle、runs[]（id/status）、
-    queue.items[]、goal.status（goal 可为空）。
+  list：id/title/runner/status/runId，以及一条 latestActivity。
+  show：session.status、session.title、session.runId，
+    session.model、session.effort、session.queuedCount，
+    session.latestMessage、session.recentTools（最多三条摘要）。
+  状态为 RUNNING/IDLE/SLEEPING；工具保留原有生命周期。
   history：segments[].items[] 中按 kind === "assistant_message"
     筛选，读取 payload.text。
 
@@ -117,6 +119,7 @@ ${configurationHelp}
   排队回执的 runId 可能属于其他活动输入，
   需按 queueItemId/clientMessageId 与可见历史核对。
   wait 通过 Watch 等待指定 Run；超时不会停止任务，
+  超时错误可附 progress，表示最后观察到的有界快照。
   Run 成功不等于业务完成。Worker 完成不自动唤醒 Coordinator。
   投递结果未知时先查状态/历史，不盲目重发。
 

package/src/sessions.mjs

@@ -349,6 +349,7 @@ export async function waitForSessionRun({
   let renewal;
   let settled = false;
   let subscribed = false;
+  let progress;
   let accept;
   let rejectResult;
   const result = new Promise((resolve, fail) => {
@@ -364,6 +365,7 @@ export async function waitForSessionRun({
   const fail = (code, key, { stage, upstreamCode, ...options } = {}) => {
     const error = new MarctlError(translate(key), { ...options, code });
     if (upstreamCode !== undefined) error.upstreamCode = upstreamCode;
+    if (stage === 'timeout' && progress !== undefined) error.progress = progress;
     reject(error, stage);
   };
   const unknown = (stage, detail, source) =>
@@ -458,8 +460,18 @@ export async function waitForSessionRun({
         unknown('snapshot', 'The requested Run was absent from the Watch snapshot.');
         return;
       }
+      if (message.payload?.session?.id === sessionId && message.payload?.progress?.runId === runId)
+        progress = message.payload.progress;
       check(run);
-    } else if (message.type === 'watch.session.event') check(message.event?.payload?.run);
+    } else if (message.type === 'watch.session.event') {
+      const payload = message.event?.payload;
+      if (
+        (payload?.sessionId ?? payload?.run?.sessionId) === sessionId &&
+        payload?.progress?.runId === runId
+      )
+        progress = payload.progress;
+      check(payload?.run);
+    }
     if (!settled && message.expiresAt !== undefined) scheduleRenewal(message.expiresAt);
   };
   const onClose = (code, reason) => {