@myagentroam/marctl 0.10.6 → 0.10.8

package/package.json

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

package/src/i18n/en-US.mjs

@@ -61,7 +61,7 @@ Usage:
 
   {program} send <session-id>
     [-m <text> | --message-file <file|->] [--image <path> ...]
-    (--forced | --queue)
+    (--steer | --queue)
     [--client-message-id <id>] [--json]
 
   {program} stop <session-id> [--run <run-id>] [--json]
@@ -82,10 +82,12 @@ Input:
 
 Delivery and waiting:
   Start/send return a clientMessageId.
-  Send requires exactly one of --forced or --queue, even when idle.
-  --forced sends if idle; if busy, interrupts then prioritizes after release.
-  --queue waits its FIFO turn without interrupting; existing pauses remain.
-  Eligible queued input can start immediately when idle.
+  Send requires exactly one of --steer or --queue, even when idle.
+  When useful, --steer adds gentle context to an in-progress task.
+  --queue places input in a subsequent turn.
+  Example:
+    marctl sessions send <session-id> --steer \\
+      -m "Additional context: focus on the resume path." --json
   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;
@@ -275,7 +277,7 @@ or Server connection is required.`
     terminalDirectUnsafeFallback:
       'Direct terminal setup could not be safely canceled after OPEN; relay fallback was skipped.',
     invalidArguments: 'Invalid command arguments.',
-    sessionDeliveryRequired: 'Send requires exactly one of --forced or --queue, even when idle.',
+    sessionDeliveryRequired: 'Send requires exactly one of --steer or --queue, even when idle.',
     sshOptionsUnsupported: 'SSH options are not supported; use marssh <host>.',
     scpOptionsUnsupported: 'This SCP option is not supported by the Node Terminal transport.',
     commandFailed: 'The command failed.'

package/src/i18n/zh-CN.mjs

@@ -60,7 +60,7 @@ ${configurationHelp}
 
   {program} send <session-id>
     [-m <text> | --message-file <file|->] [--image <path> ...]
-    (--forced | --queue)
+    (--steer | --queue)
     [--client-message-id <id>] [--json]
 
   {program} stop <session-id> [--run <run-id>] [--json]
@@ -81,10 +81,12 @@ ${configurationHelp}
 
 投递与等待：
   start/send 返回 clientMessageId。
-  send 必须二选一：--forced 或 --queue，空闲时也需指定。
-  --forced 空闲发送；忙时打断当前执行，释放后优先处理。
-  send --queue 不打断，等当前执行释放后按 FIFO 处理，保留暂停状态。
-  队列空闲且可执行时可立即开始。
+  send 必须二选一：--steer 或 --queue，空闲时也需指定。
+  --steer 在必要时为正在进行的任务补充温和的新信息。
+  --queue 将输入排入后续轮次。
+  示例：
+    marctl sessions send <session-id> --steer \\
+      -m "Additional context: focus on the resume path." --json
   排队回执的 runId 可能属于其他活动输入，
   需按 queueItemId/clientMessageId 与可见历史核对。
   wait 通过 Watch 等待指定 Run；超时不会停止任务，
@@ -261,7 +263,7 @@ ${configurationHelp}`,
     terminalSessionFailed: '终端会话失败。',
     terminalDirectUnsafeFallback: 'OPEN 后无法安全取消直连终端，已跳过 relay 回退。',
     invalidArguments: '命令参数无效。',
-    sessionDeliveryRequired: 'send 必须且只能选择 --forced 或 --queue，即使目标空闲也需指定。',
+    sessionDeliveryRequired: 'send 必须且只能选择 --steer 或 --queue，即使目标空闲也需指定。',
     sshOptionsUnsupported: '不支持 SSH 选项，请使用 marssh <节点>。',
     scpOptionsUnsupported: 'Node Terminal 传输不支持此 SCP 选项。',
     terminalBinaryUnavailable: '二进制复制需要支持 pipe 终端的 Server 与 Node。',

package/src/sessions.mjs

@@ -22,7 +22,7 @@ const commands = {
     'client-message-id'
   ],
   config: ['model', 'effort'],
-  send: ['message', 'message-file', 'image', 'forced', 'queue', 'client-message-id'],
+  send: ['message', 'message-file', 'image', 'steer', 'queue', 'client-message-id'],
   stop: ['run'],
   'goal.get': [],
   'goal.set': ['message', 'message-file'],
@@ -66,7 +66,7 @@ export function parseSessionArgs(argv, translate = createTranslator()) {
       args.json = true;
       continue;
     }
-    if (action === 'send' && (flag === '--forced' || flag === '--queue')) {
+    if (action === 'send' && (flag === '--steer' || flag === '--queue')) {
       const key = flag.slice(2);
       if (Object.hasOwn(args, key)) throw invalid();
       args[key] = true;
@@ -96,7 +96,7 @@ export function parseSessionArgs(argv, translate = createTranslator()) {
       args[key] = ms;
     } else args[key] = value;
   }
-  if (action === 'send' && (args.forced === true) === (args.queue === true))
+  if (action === 'send' && (args.steer === true) === (args.queue === true))
     throw invalid('errors.sessionDeliveryRequired');
   if (args.message !== undefined && args.messageFile !== undefined) throw invalid();
   if (
@@ -161,6 +161,8 @@ export async function runSessionCommand({ args, client, env, stdin, WebSocketCla
   if (args.action === 'current' && env.MAR_CTL_SESSION_ID) body.sessionId = env.MAR_CTL_SESSION_ID;
   if (args.action === 'start' && env.MAR_CTL_SESSION_ID)
     body.parentSessionId = env.MAR_CTL_SESSION_ID;
+  if (['start', 'send'].includes(args.action) && env.MAR_CTL_SESSION_ID)
+    body.sourceSessionId = env.MAR_CTL_SESSION_ID;
   if (args.messageFile !== undefined || args.message !== undefined)
     body.content = await messageContent(
       args,
@@ -175,7 +177,7 @@ export async function runSessionCommand({ args, client, env, stdin, WebSocketCla
   if (args.action === 'start' || args.action === 'send')
     body.clientMessageId = args.clientMessageId ?? randomUUID();
   if (args.action === 'send')
-    body.deliveryIntent = args.forced === true ? 'REPLACE_CURRENT' : 'QUEUE';
+    body.deliveryIntent = args.steer === true ? 'REPLACE_CURRENT' : 'QUEUE';
   try {
     const result = await client.sessionCommand(body);
     return {