@myagentroam/node 0.10.49 → 0.10.51

package/dist/connector.js

@@ -856,37 +856,8 @@ export class NodeConnector {
             retainEnvironment: (environment) => this.gitExecution().retain(environment),
             goalCurrent: (input) => input.goal === undefined || this.goalGenerationCurrent(input.sessionId, input.goal),
             goalActive: (sessionId) => this.goalRuntime.get(sessionId)?.status === 'active',
-            afterExecutionStarted: async (input) => {
-                if (input.goal === undefined)
-                    return;
-                if (!this.goalGenerationCurrent(input.sessionId, input.goal))
-                    return;
-                const updated = this.goalRuntime.recordTurn(input.sessionId);
-                const session = this.runtime.getAgentSession(input.sessionId);
-                const run = this.runtime.getRun(input.runId);
-                await this.enqueueGoalContinuation({
-                    sessionId: input.sessionId,
-                    goal: { id: input.goal.id, revision: input.goal.revision },
-                    ...(run?.initiatedByUserId === undefined
-                        ? {}
-                        : { initiatedByUserId: run.initiatedByUserId }),
-                    ...(input.usageGrant === undefined ? {} : { usageGrant: input.usageGrant }),
-                    secretEnvironment: input.secretEnvironment,
-                    ...(input.personalInstructions === undefined
-                        ? {}
-                        : { personalInstructions: input.personalInstructions }),
-                    ...(input.marAgentModel === undefined ? {} : { marAgentModel: input.marAgentModel }),
-                    ...(input.marAgentModels === undefined ? {} : { marAgentModels: input.marAgentModels }),
-                    ...(input.marAgentCompact === undefined
-                        ? {}
-                        : { marAgentCompact: input.marAgentCompact }),
-                    ...(input.marAgentRuntimeScopeId === undefined
-                        ? {}
-                        : { marAgentRuntimeScopeId: input.marAgentRuntimeScopeId })
-                });
-                if (updated !== undefined && session !== undefined)
-                    this.publishGoalState(session, updated);
-            },
+            afterExecutionStarted: (input) => this.maintainGoalContinuation(input, true),
+            afterExecutionSteered: (input) => this.maintainGoalContinuation(input, false),
             afterExecutionStartFailed: (input, error) => {
                 nodeLog('goal.execution-start.failed', {
                     sessionId: input.sessionId,
@@ -1963,6 +1934,34 @@ export class NodeConnector {
             current.id === goal.id &&
             current.revision === goal.revision);
     }
+    async maintainGoalContinuation(input, started) {
+        if (this.stopped || input.goal === undefined)
+            return;
+        if (!this.goalGenerationCurrent(input.sessionId, input.goal))
+            return;
+        const updated = started ? this.goalRuntime.recordTurn(input.sessionId) : undefined;
+        const session = this.runtime.getAgentSession(input.sessionId);
+        const run = this.runtime.getRun(input.runId);
+        await this.enqueueGoalContinuation({
+            sessionId: input.sessionId,
+            goal: { id: input.goal.id, revision: input.goal.revision },
+            continuationEpoch: input.goal.epoch,
+            ...(run?.initiatedByUserId === undefined ? {} : { initiatedByUserId: run.initiatedByUserId }),
+            ...(input.usageGrant === undefined ? {} : { usageGrant: input.usageGrant }),
+            secretEnvironment: input.secretEnvironment,
+            ...(input.personalInstructions === undefined
+                ? {}
+                : { personalInstructions: input.personalInstructions }),
+            ...(input.marAgentModel === undefined ? {} : { marAgentModel: input.marAgentModel }),
+            ...(input.marAgentModels === undefined ? {} : { marAgentModels: input.marAgentModels }),
+            ...(input.marAgentCompact === undefined ? {} : { marAgentCompact: input.marAgentCompact }),
+            ...(input.marAgentRuntimeScopeId === undefined
+                ? {}
+                : { marAgentRuntimeScopeId: input.marAgentRuntimeScopeId })
+        });
+        if (updated !== undefined && session !== undefined)
+            this.publishGoalState(session, updated);
+    }
     handleNativeGoalUpdate(runId, nativeGoal) {
         const pending = this.continuousRunCoordinator.pending(runId);
         if (pending?.goal === undefined || !this.goalGenerationCurrent(pending.sessionId, pending.goal))

package/dist/runner/mar-agent/marctl-skill.js

@@ -10,14 +10,14 @@ export function marctlHostSkill(environment = {}) {
         return undefined;
     return {
         name: 'marctl',
-        description: 'You are in a MAR-managed Workspace with marctl on PATH. Use this skill to inspect, create, rename, configure, message, stop or coordinate independent Sessions, manage their scheduled tasks, or use authorized Node terminals and file transfer. Load before cross-Session coordination.',
+        description: 'You are in a MAR-managed Workspace with marctl on PATH. Load this skill to create, coordinate, message or stop independent Sessions; inspect Session status/history/results; change titles or models; manage Goals or scheduled tasks for the current or other Sessions; or run commands/transfer files on other authorized MAR Nodes, even when marctl is not named. Ordinary local shell work and built-in subagents alone do not require it.',
         requiredTools: ['exec'],
         load: async () => marctlInstructions
     };
 }
 const marctlInstructions = [
     '## MAR Workspace CLI',
-    'Use exec to run marctl. Reuse loaded guidance while it remains in context. Consult local marctl help sessions for unclear options and marctl --version when version matters; neither needs a network request. Capabilities and permissions still apply.',
+    'Use exec to run marctl. Reuse loaded guidance while it remains in context. Consult local marctl help sessions for unclear options (shared by all Session subcommands) and marctl --version when version matters; neither needs a network request. Capabilities and permissions still apply.',
     'Use sessions current --json only when the current identity or scope is unknown. For a known target ID, use sessions show <session-id> --json only when fresh state is needed, without current/list first. Use sessions list --limit 10 --json to discover an unknown target; narrow with --query <title> or --parent <session-id>. These query Node-known Sessions without scanning Runners. Use sessions graph <session-id> --json only for a creation tree (bounded to 100 nodes with truncated); start automatically records the current Session as parent, not task ownership. Stop once found and follow nextCursor only if needed. Do not scan the Workspace to prove capacity: check assigned work, recorded worker IDs and overlapping write scopes.',
     'MAR binds sessions to the current Node and Workspace. No --node or --workspace override exists. Use returned native Session IDs, not titles, for later operations. A Workspace terminal may have no current Session. Missing scope, an old Node, expired authorization or an unavailable Runner is an explicit error, not permission to bypass the API.',
     '## Create and coordinate independent Sessions',
@@ -29,7 +29,7 @@ const marctlInstructions = [
     'show --json fields: session.activity, session.model, session.effort, session.customTitle or session.runnerTitle, runs[] (id/status), queue.items[], and goal.status (goal may be null). Run status and Goal status are separate.',
     'Rename any authorized Workspace Session with sessions rename <session-id> --title <name> --json; parent relationships do not restrict renaming.',
     'show/config/history/graph/rename and schedule get/create/update may omit the Session ID to use the current Session. Without a current Session, specify an ID. send/goal/stop/wait always require explicit target IDs.',
-    'Use sessions schedule list/get/create/update for the same tasks as the built-in schedule MCP, which is hidden while this skill is available. list is Workspace-scoped. create requires --cron and text (-m/--message-file, up to 20,000 characters). update requires --expected-revision from get and at least cron or text. Other-owner edits return a PENDING proposal, not an applied change; scheduled execution is read-only. Follow existing approval rules and do not retry conflicts or uncertain writes blindly.',
+    'Use sessions schedule list/get/create/update for the same tasks as the built-in schedule MCP, which is hidden while this skill is available. list is Workspace-scoped. create requires --cron and text (-m/--message-file, up to 20,000 characters). update requires --expected-revision from get and at least cron or text. get returns task (null if absent), with id, revision, objective, cron, timezone and enabled; applied updates also return task. Reuse that task instead of probing its shape or refetching unchanged state. Schedule text is trimmed at both ends; compare after the same trimming; a conclusive update response needs no extra get. Other-owner edits return a PENDING proposal, not an applied change; scheduled execution is read-only. Follow existing approval rules and do not retry conflicts or uncertain writes blindly.',
     'Read results with sessions history <session-id> --limit 10 --json (default: latest 10 SEGMENTs, not messages; --limit 1..100). In segments[].items[], select kind === "assistant_message" and read payload.text; keep segment runId and user_message.payload.clientMessageId for queued-input correlation. Reuse the returned page; follow --cursor <nextCursor> only for missing evidence.',
     'Use sessions send <session-id> --steer -m "Additional context: focus on the resume path." --json for decision-changing updates rather than routine reports: it may switch the current execution. Node decides delivery from actual state; an idle Session receives ordinary input. Choose exactly one of --steer or --queue, even when idle; missing, conflicting, repeated, or obsolete options are rejected locally before input is read or a request is sent. Use --queue to place input in a subsequent turn; with an active Goal, ordinary queued input waits until the Goal exits. start/send return clientMessageId and the accepted/queued result. A queued result may refer to the currently active Run: associate queueItemId/clientMessageId with history before deciding that input finished. There are no queue-item edit/delete/reorder commands; show includes queue state.',
     'Wait with sessions wait <session-id> --run <run-id> --timeout 5m --json through the existing Watch. Prefer --timeout 5m when blocked on task completion; use 30s for a short deadline. Continue useful independent work before waiting. If exec returns a running process or cell, reuse its process/cell handle rather than starting another wait or polling show/list. Timeout or cancelled waiting does not stop the task. Use sessions stop <session-id> --run <run-id> --json only to stop that active Run; ownership rules still apply.',

package/dist/service/continuous-run-coordinator.js

@@ -121,7 +121,7 @@ export class ContinuousRunCoordinator {
             const attempt = this.tryNativeSteer(input.submissionId, active, input.onNativeAccepted);
             if (attempt)
                 return attempt.then((accepted) => accepted
-                    ? 'RESTARTING'
+                    ? 'ACCEPTED'
                     : this.suspended || this.options.stopped()
                         ? 'QUEUED'
                         : this.settleFallback(input));
@@ -166,7 +166,7 @@ export class ContinuousRunCoordinator {
                     this.options.runtime.prioritizeQueueItem(item.id);
                 this.publish(sessionId);
                 this.scheduleImmediate(sessionId);
-                return 'RESTARTING';
+                return 'ACCEPTED';
             }
             if (this.options.runtime.currentExecutionId(active.id) === undefined &&
                 !this.isMessageRun(active)) {
@@ -176,7 +176,7 @@ export class ContinuousRunCoordinator {
                 return 'QUEUED';
             }
             this.replace(input.submissionId, active.id);
-            return 'RESTARTING';
+            return 'ACCEPTED';
         }
         if (startsAcceptedRun) {
             this.schedule(sessionId);
@@ -214,7 +214,7 @@ export class ContinuousRunCoordinator {
             const attempt = this.tryNativeSteer(itemId, active);
             if (attempt)
                 return attempt.then((accepted) => accepted
-                    ? { run: active, delivery: 'RESTARTING' }
+                    ? { run: active, delivery: 'ACCEPTED' }
                     : this.suspended || this.options.stopped()
                         ? { run: active, delivery: 'QUEUED' }
                         : this.executeQueueItemFallback(itemId));
@@ -247,15 +247,31 @@ export class ContinuousRunCoordinator {
             return undefined;
         }
         const task = attempt
-            .then((result) => {
+            .then(async (result) => {
             if (result.status === 'notAccepted')
                 return false;
             onAccepted?.();
             this.options.runtime.consumeSteeredQueueItem(itemId, active.id);
-            this.remove(itemId);
             this.immediateQueueItems.delete(itemId);
             this.options.runtime.resumeSessionQueue(item.sessionId);
             this.options.clearImages(itemId);
+            if (prepared.goal !== undefined && this.goalCurrent(prepared)) {
+                const current = this.preparedInputs.get(executionId);
+                if (current !== undefined)
+                    this.preparedInputs.set(executionId, { ...current, goal: prepared.goal });
+            }
+            try {
+                await this.options.afterExecutionSteered?.({ ...prepared, runId: executionId });
+            }
+            catch (error) {
+                nodeLog('queue.native_steer.continuation_failed', {
+                    level: 'warn',
+                    sessionId: item.sessionId,
+                    executionId,
+                    code: safeErrorCode(error, 'NATIVE_STEER_CONTINUATION_FAILED')
+                });
+            }
+            this.remove(itemId);
             // Publication is best effort after ownership transfers; it cannot undo SDK acceptance.
             for (const notify of [
                 () => {
@@ -301,7 +317,7 @@ export class ContinuousRunCoordinator {
                 if (this.isMessageRun(active))
                     this.scheduleImmediate(item.sessionId);
             }
-            return { run: active, delivery: 'RESTARTING' };
+            return { run: active, delivery: 'ACCEPTED' };
         }
         this.startIdleQueue(item.sessionId);
         const started = this.options.runtime.activeSessionRun(item.sessionId);
@@ -591,6 +607,9 @@ export class ContinuousRunCoordinator {
         for (const [id, pending] of this.preparedInputs) {
             if (id === preservedSubmissionId)
                 continue;
+            // Native admission owns receiving items until its receipt settles.
+            if (this.steerInFlight.has(id))
+                continue;
             if (pending.sessionId !== sessionId || pending.goal === undefined)
                 continue;
             if (pending.goal.id === preservedGoal?.id && pending.goal.revision === preservedGoal.revision)

package/dist/service/workspace-upload-service.js

@@ -1,5 +1,5 @@
 import { createHash, randomUUID } from 'node:crypto';
-import { link, lstat, mkdir, open, readFile, rename, rm, stat } from 'node:fs/promises';
+import { link, lstat, mkdir, open, readFile, rename, rm } from 'node:fs/promises';
 import { dirname, join, posix, resolve } from 'node:path';
 import { parseComposerAttachmentUpload, validComposerAttachmentName } from '../util/node-operation-parsers.js';
 import { preflightWorkspaceUpload, workspaceUploadTemporaryName } from '../workspace.js';
@@ -61,9 +61,7 @@ export class WorkspaceUploadService {
             throw new Error('UPLOAD_TARGET_BUSY');
         const id = randomUUID();
         const temporaryPath = resolve(dirname(target.absolutePath), workspaceUploadTemporaryName(id));
-        const parentIdentity = await stat(dirname(target.absolutePath));
         const handle = await open(temporaryPath, 'wx+');
-        const stagingIdentity = await handle.stat();
         const timer = setTimeout(() => {
             const upload = this.state.uploads.get(id);
             if (upload !== undefined)
@@ -73,8 +71,6 @@ export class WorkspaceUploadService {
             id,
             workspaceId: workspace.id,
             workspacePath: workspace.path,
-            parentIdentity,
-            stagingIdentity,
             path: target.path,
             targetPath: target.absolutePath,
             temporaryPath,
@@ -361,15 +357,10 @@ export class WorkspaceUploadService {
                 throw new Error('UPLOAD_TARGET_EXISTS');
         }
         const parent = await lstat(dirname(upload.targetPath));
-        if (!parent.isDirectory() ||
-            parent.isSymbolicLink() ||
-            !sameIdentity(parent, upload.parentIdentity))
+        if (!parent.isDirectory() || parent.isSymbolicLink())
             throw new Error('UPLOAD_TARGET_INVALID');
         const staging = await lstat(upload.temporaryPath);
-        if (!staging.isFile() ||
-            staging.isSymbolicLink() ||
-            !sameIdentity(staging, upload.stagingIdentity) ||
-            staging.size !== upload.size)
+        if (!staging.isFile() || staging.isSymbolicLink() || staging.size !== upload.size)
             throw new Error('UPLOAD_STAGING_INVALID');
     }
     async remove(upload) {
@@ -382,9 +373,9 @@ export class WorkspaceUploadService {
                 return undefined;
             throw error;
         });
-        if (!sameIdentity(parent, upload.parentIdentity) ||
+        if (!parent.isDirectory() ||
             parent.isSymbolicLink() ||
-            (staging !== undefined && !sameIdentity(staging, upload.stagingIdentity)))
+            (staging !== undefined && (!staging.isFile() || staging.isSymbolicLink())))
             throw new Error('UPLOAD_CLEANUP_FAILED');
         if (staging !== undefined)
             await rm(upload.temporaryPath, { force: true });
@@ -427,9 +418,6 @@ export class WorkspaceUploadService {
         };
     }
 }
-function sameIdentity(actual, expected) {
-    return actual.dev === expected.dev && actual.ino === expected.ino;
-}
 async function safeDirectory(path) {
     const value = await lstat(path);
     if (!value.isDirectory() || value.isSymbolicLink())

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/node",
-  "version": "0.10.49",
+  "version": "0.10.51",
   "description": "MyAgentRoam Node runtime CLI.",
   "license": "Apache-2.0 AND GPL-2.0-or-later",
   "type": "module",
@@ -37,10 +37,10 @@
     "playwright": "1.62.1",
     "ws": "^8.21.3",
     "zod": "4.4.3",
-    "@myagentroam/agent": "0.10.49",
+    "@myagentroam/agent": "0.10.51",
     "@myagentroam/code-navigation": "0.10.1",
-    "@myagentroam/marctl": "0.10.10",
-    "@myagentroam/protocol": "0.10.49"
+    "@myagentroam/protocol": "0.10.51",
+    "@myagentroam/marctl": "0.10.10"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"