@myagentroam/agent 0.9.163 → 0.9.164

package/dist/agent-core/host/local-process-executor.d.ts

@@ -4,9 +4,11 @@ export interface LocalProcessSpawnRequest {
     readonly args?: readonly string[];
     readonly cwd: string;
     readonly shell?: boolean | string;
+    /** Shell startup for exec only; native processes and workers omit this field. */
+    readonly shellLogin?: boolean;
     readonly environment: NodeJS.ProcessEnv;
     /** Explicit per-start values take precedence over execution-bound Host environment. */
-    readonly environmentOverrides?: Readonly<Record<string, string>>;
+    readonly environmentOverrides?: Readonly<Record<string, string | undefined>>;
     readonly environmentKeys?: readonly string[];
     /** Trusted, bounded read-only worker assets; never supplied by model tool input. */
     readonly runtimeDirectories?: readonly string[];

package/dist/agent-core/host/local-process-executor.js

@@ -1,7 +1,9 @@
 import { spawn } from 'node:child_process';
+import { prepareLocalShellProcess } from './local-shell.js';
 /** Preserves the direct local execution behavior used by the CLI and normal Node Workbench. */
 export const directLocalProcessExecutor = {
     async spawn(request) {
+        request = prepareLocalShellProcess(request);
         return spawn(request.command, [...(request.args ?? [])], {
             cwd: request.cwd,
             shell: request.shell ?? false,

package/dist/agent-core/host/local-session-environment.js

@@ -50,12 +50,22 @@ export class LocalSessionEnvironment {
             (this.platform !== 'win32' || request.environmentOverrides === undefined))
             return request;
         const environment = { ...request.environment };
+        const overrides = {};
         const assign = (key, value) => {
             if (this.platform === 'win32') {
                 for (const current of Object.keys(environment))
                     if (this.#key(current) === this.#key(key))
                         delete environment[current];
+                for (const current of Object.keys(overrides))
+                    if (this.#key(current) === this.#key(key))
+                        delete overrides[current];
             }
+            Object.defineProperty(overrides, key, {
+                value,
+                enumerable: true,
+                writable: true,
+                configurable: true
+            });
             if (value === undefined)
                 delete environment[key];
             else
@@ -75,6 +85,7 @@ export class LocalSessionEnvironment {
         return {
             ...request,
             environment,
+            environmentOverrides: overrides,
             ...(request.environmentKeys === undefined
                 ? {}
                 : {

package/dist/agent-core/host/local-shell.d.ts

@@ -0,0 +1,3 @@
+import type { LocalProcessSpawnRequest } from './local-process-executor.js';
+/** Resolve Shell startup in the executor, after its environment policy has been applied. */
+export declare function prepareLocalShellProcess(request: LocalProcessSpawnRequest, platform?: NodeJS.Platform): LocalProcessSpawnRequest;

package/dist/agent-core/host/local-shell.js

@@ -0,0 +1,78 @@
+import { randomUUID } from 'node:crypto';
+import { basename, win32 } from 'node:path';
+/** Resolve Shell startup in the executor, after its environment policy has been applied. */
+export function prepareLocalShellProcess(request, platform = process.platform) {
+    if (!request.shell || request.shellLogin === undefined)
+        return request;
+    const shell = typeof request.shell === 'string'
+        ? request.shell
+        : platform === 'win32'
+            ? (request.environment.ComSpec ?? request.environment.COMSPEC ?? 'cmd.exe')
+            : '/bin/sh';
+    const name = (platform === 'win32' ? win32.basename(shell) : basename(shell))
+        .replace(/\.exe$/iu, '')
+        .toLowerCase();
+    const powershell = name === 'pwsh' || name === 'powershell';
+    if (!powershell && !['bash', 'zsh', 'sh'].includes(name))
+        return request;
+    const login = request.shellLogin;
+    const environment = { ...request.environment };
+    const script = [];
+    if (login && name === 'bash') {
+        script.push('if [ -z "${BASH_ENV-}" ] && [ -n "${HOME-}" ] && [ -r "$HOME/.bashrc" ]; then', '  . "$HOME/.bashrc"', 'fi');
+    }
+    else if (login && name === 'zsh') {
+        script.push('if [[ -n "${ZDOTDIR-}" ]]; then', '  [[ ! -r "$ZDOTDIR/.zshrc" ]] || . "$ZDOTDIR/.zshrc"', 'elif [[ -n "${HOME-}" ]]; then', '  [[ ! -r "$HOME/.zshrc" ]] || . "$HOME/.zshrc"', 'fi');
+    }
+    // Keep values out of argv and tool-visible command history, including quoting-sensitive values.
+    const privatePrefix = `__MAR_SHELL_${randomUUID().replaceAll('-', '')}_`;
+    const restoration = [];
+    let index = 0;
+    for (const [key, value] of Object.entries(request.environmentOverrides ?? {})) {
+        if (!powershell && !/^[A-Za-z_][A-Za-z0-9_]*$/u.test(key))
+            continue;
+        const quotedKey = `'${key.replaceAll("'", "''")}'`;
+        if (value === undefined) {
+            restoration.push(powershell
+                ? `[Environment]::SetEnvironmentVariable(${quotedKey}, $null, 'Process')`
+                : `if [ "\${${key}+x}" = x ]; then unset ${key} || exit; fi`);
+            continue;
+        }
+        const privateKey = `${privatePrefix}${index++}`;
+        environment[privateKey] = value;
+        restoration.push(powershell
+            ? `if (-not (Test-Path Env:${privateKey})) { throw 'Shell startup removed a protected environment value.' }`
+            : `[ "\${${privateKey}+x}" = x ] || { printf '%s\\n' 'Shell startup removed a protected environment value.' >&2; exit 1; }`);
+        restoration.push(powershell
+            ? `[Environment]::SetEnvironmentVariable(${quotedKey}, $env:${privateKey}, 'Process'); Remove-Item Env:${privateKey}`
+            : `if [ "\${${key}+x}" != x ] || [ "\${${key}-}" != "\$${privateKey}" ]; then export ${key}="\$${privateKey}" || exit; else export ${key} || exit; fi; unset ${privateKey}`);
+    }
+    if (restoration.length && !powershell) {
+        const traceKey = `${privatePrefix}TRACE`;
+        // A profile may enable xtrace; do not print expanded private values during restoration.
+        script.push(`case $- in *x*) set +x; ${traceKey}=1 ;; *) ${traceKey}= ;; esac`, ...restoration, `if [ "\$${traceKey}" = 1 ]; then unset ${traceKey}; set -x; else unset ${traceKey}; fi`);
+    }
+    else {
+        script.push(...restoration);
+    }
+    script.push(request.command);
+    return {
+        ...request,
+        command: shell,
+        args: [
+            ...(powershell ? [...(login ? [] : ['-NoProfile']), '-Command'] : [login ? '-lc' : '-c']),
+            script.join('\n'),
+            ...(request.args ?? [])
+        ],
+        shell: false,
+        environment,
+        ...(request.environmentKeys === undefined
+            ? {}
+            : {
+                environmentKeys: [
+                    ...request.environmentKeys,
+                    ...Object.keys(environment).filter((key) => key.startsWith(privatePrefix))
+                ]
+            })
+    };
+}

package/dist/agent-core/tools/agent/todo-read.js

@@ -2,7 +2,7 @@ export const todoReadToolDefinition = {
     name: 'todo_read',
     allowedCallers: ['direct', 'programmatic'],
     parallelSafety: 'safe',
-    description: 'Read this session’s current Todo revision and items. Use before updating when the revision may have changed. Do not read an empty or new Todo merely to decide whether straightforward bounded work needs one.',
+    description: 'Read this session’s current Todo revision and items when you need the existing list. A prior read is not required to write Todo. Do not read an empty or new Todo merely to decide whether straightforward bounded work needs one.',
     inputSchema: { type: 'object', properties: {}, additionalProperties: false }
 };
 export function executeTodoRead(context) {

package/dist/agent-core/tools/agent/todo-write.js

@@ -4,11 +4,10 @@ export const todoWriteToolDefinition = {
     name: 'todo_write',
     allowedCallers: ['direct', 'programmatic'],
     parallelSafety: 'serial',
-    description: 'Replace this session’s entire Todo list using optimistic expectedRevision. Preserve stable IDs and statuses only when extending the same objective. For a materially different objective, include only the new objective’s items. Do not retain completed items from an earlier objective; when all current items are completed, default a substantive new request to replacement unless the user explicitly asks to continue, extend, verify, or follow up. Use only after Todo has been chosen for coordination-heavy work; straightforward bounded work does not need it. Keep at most one in_progress item and update statuses after meaningful stage changes. When another substantive tool call is already ready and does not depend on the Todo result, include both in the same model response instead of spending a response only for Todo bookkeeping.',
+    description: 'Replace this session’s entire Todo list with the supplied items; no prior read is required. Preserve stable IDs and statuses only when extending the same objective. For a materially different objective, include only the new objective’s items. Do not retain completed items from an earlier objective; when all current items are completed, default a substantive new request to replacement unless the user explicitly asks to continue, extend, verify, or follow up. Use only after Todo has been chosen for coordination-heavy work; straightforward bounded work does not need it. Keep at most one in_progress item and update statuses after meaningful stage changes. When another substantive tool call is already ready and does not depend on the Todo result, include both in the same model response instead of spending a response only for Todo bookkeeping.',
     inputSchema: {
         type: 'object',
         properties: {
-            expectedRevision: { type: 'integer' },
             items: {
                 type: 'array',
                 maxItems: TOOL_EXECUTION_LIMITS.todoMaxItems,
@@ -24,7 +23,7 @@ export const todoWriteToolDefinition = {
                 }
             }
         },
-        required: ['expectedRevision', 'items'],
+        required: ['items'],
         additionalProperties: false
     }
 };
@@ -38,9 +37,7 @@ function parseTodoWriteInput(value) {
     if (!value || typeof value !== 'object' || Array.isArray(value))
         return invalid();
     const input = value;
-    if (Object.keys(input).some((key) => !['expectedRevision', 'items'].includes(key)) ||
-        !Number.isInteger(input.expectedRevision) ||
-        input.expectedRevision < 0 ||
+    if (Object.keys(input).some((key) => key !== 'items') ||
         !Array.isArray(input.items) ||
         input.items.length > TOOL_EXECUTION_LIMITS.todoMaxItems)
         return invalid();
@@ -59,7 +56,7 @@ function parseTodoWriteInput(value) {
             return invalid();
         return { id: record.id, step: record.step, status: record.status };
     });
-    return { expectedRevision: input.expectedRevision, items };
+    return { items };
 }
 function invalid() {
     throw new MarAgentError('MAR_AGENT_TOOL_INPUT_INVALID', 'Todo input is invalid.');

package/dist/agent-core/tools/agent/todo.d.ts

@@ -12,7 +12,6 @@ export declare class TodoStore {
         }[];
     };
     write(input: {
-        expectedRevision: number;
         items: readonly TodoItem[];
     }): {
         revision: number;

package/dist/agent-core/tools/agent/todo.js

@@ -14,10 +14,6 @@ export class TodoStore {
         return { revision: this.#revision, items: this.#items.map((item) => ({ ...item })) };
     }
     write(input) {
-        if (input.expectedRevision !== this.#revision)
-            throw new MarAgentError('MAR_AGENT_TODO_CONFLICT', 'Todo revision is stale.', {
-                details: { revision: this.#revision }
-            });
         this.#items = normalizeTodoItems(input.items);
         this.#revision++;
         return this.read();
@@ -44,10 +40,7 @@ export function restoreTodoStore(snapshots) {
         const items = todoItemsFromSnapshot(snapshot);
         if (!items)
             continue;
-        todo.write({
-            expectedRevision: todo.read().revision,
-            items
-        });
+        todo.write({ items });
     }
     return todo;
 }

package/dist/agent-core/tools/local/exec.d.ts

@@ -9,6 +9,7 @@ export type ExecInput = {
     action?: 'start';
     command: string;
     cwd?: string;
+    login?: boolean;
     timeoutMs?: number;
     yieldMs?: number;
 } | {

package/dist/agent-core/tools/local/exec.js

@@ -53,6 +53,11 @@ export const execToolDefinition = {
                 type: 'string',
                 description: 'Optional relative/absolute start directory; defaults to workspace. Command-internal relative paths resolve from this directory.'
             },
+            login: {
+                type: 'boolean',
+                default: true,
+                description: 'Use the Shell login/profile initialization. Defaults to true; false skips login startup. Does not force an interactive Shell.'
+            },
             timeoutMs: {
                 type: 'integer',
                 minimum: 1,
@@ -105,7 +110,7 @@ export function execToolInput(name, value) {
         return invalidExecInput();
     const input = value;
     const allowed = name === 'exec'
-        ? ['command', 'cwd', 'timeoutMs', 'yieldMs']
+        ? ['command', 'cwd', 'login', 'timeoutMs', 'yieldMs']
         : ['processId', 'action', 'yieldMs', 'data'];
     if (Object.keys(input).some((key) => !allowed.includes(key)))
         return invalidExecInput();
@@ -174,6 +179,7 @@ export class ExecTool {
                 command: input.command,
                 cwd: cwd.physicalPath,
                 shell: this.shell ?? true,
+                shellLogin: input.login ?? true,
                 environment: this.environment,
                 displayCwd: cwd.displayPath,
                 detached: process.platform !== 'win32',
@@ -662,11 +668,14 @@ function parseExecInput(value) {
             return invalidExecInput();
         if (input.cwd !== undefined && input.cwd !== null && typeof input.cwd !== 'string')
             return invalidExecInput();
+        if (input.login !== undefined && input.login !== null && typeof input.login !== 'boolean')
+            return invalidExecInput();
         const timeoutMs = optionalBoundedInteger(input.timeoutMs, 1, TOOL_EXECUTION_LIMITS.execMaxTimeoutMs);
         return {
             ...(input.action === 'start' ? { action: 'start' } : {}),
             command: input.command,
             ...(typeof input.cwd === 'string' ? { cwd: input.cwd } : {}),
+            ...(typeof input.login === 'boolean' ? { login: input.login } : {}),
             ...(timeoutMs === undefined ? {} : { timeoutMs }),
             ...(yieldMs === undefined ? {} : { yieldMs })
         };

package/dist/sandbox/linux/bubblewrap-sandbox-executor.js

@@ -5,6 +5,7 @@ import { tmpdir } from 'node:os';
 import { isAbsolute, join, posix, relative, resolve, sep } from 'node:path';
 import { promisify } from 'node:util';
 import { MarAgentError } from '../../agent-core/error.js';
+import { prepareLocalShellProcess } from '../../agent-core/host/local-shell.js';
 import { LINUX_BUBBLEWRAP_SANDBOX_POLICY_VERSION } from './profile.js';
 const execFileAsync = promisify(execFile);
 const DEFAULT_BUBBLEWRAP_PATH = '/usr/bin/bwrap';
@@ -63,12 +64,24 @@ export class BubblewrapSandboxExecutor {
         const mounts = await this.#mounts();
         const runtimeMounts = await trustedRuntimeMounts(request.runtimeDirectories ?? [], mounts);
         const cwd = await workingDirectory(request, mounts, this.options.profile.workingDirectory);
-        const command = sandboxCommand(request, mounts);
+        // Apply the sandbox policy before creating private startup-override variables.
+        const environment = Object.fromEntries(explicitEnvironment(request));
+        const shellRequest = prepareLocalShellProcess({
+            ...request,
+            environment,
+            environmentKeys: Object.keys(environment),
+            environmentOverrides: Object.fromEntries(Object.entries(request.environmentOverrides ?? {})
+                .filter(([name, value]) => SAFE_ENVIRONMENT_NAME.test(name) &&
+                !FORBIDDEN_ENVIRONMENT_NAMES.has(name) &&
+                (value === undefined || Object.hasOwn(environment, name)))
+                .map(([name, value]) => [name, value === undefined ? undefined : environment[name]]))
+        });
+        const command = sandboxCommand(shellRequest, mounts);
         const launchDirectory = await mkdtemp(join(tmpdir(), 'mar-agent-bwrap-launch-'));
         const argumentPath = join(launchDirectory, 'arguments');
         const seccompPath = join(launchDirectory, 'seccomp.bpf');
         try {
-            const arguments_ = this.#arguments(mounts, cwd, request, runtimeMounts);
+            const arguments_ = this.#arguments(mounts, cwd, shellRequest, runtimeMounts);
             await Promise.all([
                 writeFile(argumentPath, `${arguments_.join('\0')}\0`, { mode: 0o600, flag: 'wx' }),
                 writeFile(seccompPath, seccompFilter(process.arch), { mode: 0o600, flag: 'wx' })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/agent",
-  "version": "0.9.163",
+  "version": "0.9.164",
   "description": "Embeddable MAR coding agent SDK and CLI.",
   "license": "Apache-2.0",
   "type": "module",