@myagentroam/node 0.9.0 → 0.9.2

package/dist/service/workspace-git-exclude-service.js

@@ -0,0 +1,119 @@
+import { randomUUID } from 'node:crypto';
+import { execFile } from 'node:child_process';
+import { lstat, mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises';
+import path from 'node:path';
+import { promisify } from 'node:util';
+const MAR_TEMP_DIRECTORY = '/.mar/';
+const BLOCK_BEGIN = '# BEGIN MyAgentRoam';
+const BLOCK_END = '# END MyAgentRoam';
+const LEGACY_BLOCK_BEGIN = '# BEGIN MyAgentRoam Skills';
+const LEGACY_BLOCK_END = '# END MyAgentRoam Skills';
+export async function ensureWorkspaceGitExclude(workspace) {
+    await mutateGitExclude(workspace, (entries) => entries.add(MAR_TEMP_DIRECTORY));
+}
+export async function updateWorkspaceSkillGitExclude(workspace, name, add) {
+    await mutateGitExclude(workspace, (entries) => {
+        entries.add(MAR_TEMP_DIRECTORY);
+        for (const root of ['.agents', '.claude']) {
+            const line = `/${root}/skills/${name}/`;
+            if (add)
+                entries.add(line);
+            else
+                entries.delete(line);
+        }
+    });
+}
+export async function rewriteWorkspaceGitExclude(workspace, names) {
+    await mutateGitExclude(workspace, (entries) => {
+        entries.clear();
+        entries.add(MAR_TEMP_DIRECTORY);
+        for (const name of names)
+            for (const root of ['.agents', '.claude'])
+                entries.add(`/${root}/skills/${name}/`);
+    });
+}
+export async function hasBrokenWorkspaceSkillGitExclude(workspace, names) {
+    if (!(await exists(path.join(workspace, '.git'))))
+        return false;
+    try {
+        const exclude = await resolveGitExclude(workspace);
+        const content = await readFile(exclude, 'utf8');
+        return names
+            .flatMap((name) => [`/.agents/skills/${name}/`, `/.claude/skills/${name}/`])
+            .some((entry) => !content.includes(entry));
+    }
+    catch {
+        return true;
+    }
+}
+async function mutateGitExclude(workspace, mutate) {
+    if (!(await exists(path.join(workspace, '.git'))))
+        return;
+    const exclude = await resolveGitExclude(workspace);
+    await mkdir(path.dirname(exclude), { recursive: true });
+    let content = '';
+    try {
+        const excludeStat = await lstat(exclude);
+        if (!excludeStat.isFile() || excludeStat.isSymbolicLink())
+            throw new Error('WORKSPACE_SKILL_GIT_EXCLUDE_FAILED');
+        content = await readFile(exclude, 'utf8');
+    }
+    catch (error) {
+        if (!isMissing(error))
+            throw error;
+    }
+    const pattern = managedBlockPattern();
+    const existing = [...content.matchAll(pattern)].map((match) => match[0]).join('\n');
+    const entries = new Set(existing.split(/\r?\n/u).filter((line) => line.startsWith('/.')));
+    mutate(entries);
+    const block = `${BLOCK_BEGIN}\n${[...entries].sort().join('\n')}\n${BLOCK_END}\n`;
+    const next = content.replace(pattern, '').replace(/\s*$/u, '\n') + block;
+    const staging = path.join(path.dirname(exclude), `.mar-git-exclude-${randomUUID()}.tmp`);
+    try {
+        await writeFile(staging, next, { encoding: 'utf8', flag: 'wx' });
+        await rename(staging, exclude);
+    }
+    catch (error) {
+        await rm(staging, { force: true });
+        throw error;
+    }
+}
+async function resolveGitExclude(workspace) {
+    try {
+        const result = await promisify(execFile)('git', ['-C', workspace, 'rev-parse', '--git-path', 'info/exclude', '--git-common-dir'], { timeout: 5_000, windowsHide: true });
+        const [excludeOutput, commonOutput] = result.stdout.trim().split(/\r?\n/u);
+        if (!excludeOutput || !commonOutput)
+            throw new Error();
+        const exclude = path.resolve(workspace, excludeOutput);
+        const common = path.resolve(workspace, commonOutput);
+        const relative = path.relative(common, exclude);
+        if (relative.startsWith('..') || path.isAbsolute(relative))
+            throw new Error();
+        return exclude;
+    }
+    catch {
+        throw new Error('WORKSPACE_SKILL_GIT_EXCLUDE_FAILED');
+    }
+}
+async function exists(value) {
+    try {
+        await lstat(value);
+        return true;
+    }
+    catch (error) {
+        if (isMissing(error))
+            return false;
+        throw error;
+    }
+}
+function isMissing(error) {
+    return (error instanceof Error && 'code' in error && error.code === 'ENOENT');
+}
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
+}
+function managedBlockPattern() {
+    const current = `${escapeRegExp(BLOCK_BEGIN)}\\r?\\n[\\s\\S]*?${escapeRegExp(BLOCK_END)}(?:\\r?\\n)?`;
+    const legacy = `${escapeRegExp(LEGACY_BLOCK_BEGIN)}\\r?\\n[\\s\\S]*?${escapeRegExp(LEGACY_BLOCK_END)}(?:\\r?\\n)?`;
+    return new RegExp(`(?:${current}|${legacy})`, 'gu');
+}

package/dist/service/workspace-queue-workbench-service.js

@@ -1,6 +1,7 @@
 import { isPlainRecord } from '../runner/codex/conversation-parser.js';
 import { isTerminalRunStatus } from '../util/node-operation-parsers.js';
 import { withNonImageAttachmentPrompt } from '../runner/codex/conversation-parser.js';
+import { safeErrorCode } from '../util/safe-error.js';
 export class WorkspaceQueueWorkbenchService {
     options;
     starts = new Map();
@@ -183,7 +184,7 @@ export class WorkspaceQueueWorkbenchService {
             });
         }
         catch (error) {
-            this.options.emitRun(run.id, 'run.rejected', { code: error instanceof Error ? error.message : 'QUEUE_START_FAILED' }, 'FAILED');
+            this.options.emitRun(run.id, 'run.rejected', { code: safeErrorCode(error, 'QUEUE_START_FAILED') }, 'FAILED');
         }
     }
     present(workspaceId, sessionId) {
@@ -203,7 +204,7 @@ export class WorkspaceQueueWorkbenchService {
                     {
                         run,
                         sessionId: run.sessionId,
-                        sessionTitle: queuedSession?.customTitle ?? queuedSession?.runnerTitle ?? '未命名会话',
+                        sessionTitle: queuedSession?.customTitle ?? queuedSession?.runnerTitle ?? 'Untitled session',
                         content: this.options.runtime.queuedMessageText(run.id)
                     }
                 ];

package/dist/service/workspace-service.js

@@ -1,5 +1,6 @@
 import { rmdir } from 'node:fs/promises';
 import { createWorkspaceDirectory, inspectWorkspace, listWorkspaceDirectories } from '../workspace.js';
+import { ensureWorkspaceGitExclude } from './workspace-git-exclude-service.js';
 export class WorkspaceService {
     database;
     config;
@@ -31,6 +32,7 @@ export class WorkspaceService {
                 ? (createdPath = await createWorkspaceDirectory(input.path, input.createDirectoryName, this.config().allowedRoots))
                 : input.path;
             const inspected = await inspectWorkspace(path, this.config().allowedRoots);
+            await ensureWorkspaceGitExclude(inspected.path);
             return {
                 workspace: this.database().saveWorkspace({
                     path: inspected.path,

package/dist/supervisor.js

@@ -4,6 +4,7 @@ import { dirname, resolve } from 'node:path';
 import { loadNodeConfig, nodeDatabasePath } from './config.js';
 import { nodeLog, platformCliInvocation } from './operational.js';
 import { nodeUpgradeRequestPath } from './service/node-upgrade-coordinator.js';
+import { safeErrorCode } from './util/safe-error.js';
 const UPGRADE_EXIT_CODE = 75;
 const STABLE_VERSION = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/u;
 export async function superviseNode(configPath, bootstrapEntrypoint) {
@@ -73,7 +74,7 @@ export async function superviseNode(configPath, bootstrapEntrypoint) {
         catch (error) {
             await writeResult(dataDirectory, {
                 state: 'FAILED',
-                errorCode: error instanceof Error ? error.message : 'NODE_UPGRADE_INSTALL_FAILED',
+                errorCode: safeErrorCode(error, 'NODE_UPGRADE_INSTALL_FAILED'),
                 updatedAt: Date.now()
             });
             await rm(requestPath, { force: true });

package/dist/terminal.js

@@ -384,7 +384,7 @@ function defaultTerminalProfiles(platform) {
     return [
         {
             id: 'default',
-            label: '用户 Shell',
+            label: 'User Shell',
             shell: process.env['SHELL']?.trim() || '/bin/bash',
             args: ['-l', '-i'],
             isDefault: true

package/dist/util/node-operation-parsers.js

@@ -2,7 +2,7 @@ import { nodeCapabilitiesSchema } from '@myagentroam/protocol';
 const MAX_COMPOSER_ATTACHMENT_BYTES = 5 * 1024 * 1024;
 const MAX_COMPOSER_ATTACHMENTS_BYTES = 10 * 1024 * 1024;
 const USER_AUTHORIZATION_CLOCK_SKEW_MS = 5_000;
-const NON_IMAGE_ATTACHMENT_PROMPT_PREFIX = '\n\n本轮非图片附件已上传到工作区，请按需读取以下文件：\n';
+const NON_IMAGE_ATTACHMENT_PROMPT_PREFIX = '\n\nNon-image attachments for this turn were uploaded to the Workspace. Read these files as needed:\n';
 const COMPOSER_IMAGE_MIME_TYPES = new Set([
     'image/png',
     'image/jpeg',
@@ -100,7 +100,7 @@ export function compactRunnerValue(value, limit) {
             text = JSON.stringify(value);
         }
         catch {
-            return { text: '（无法显示）', truncated: false };
+            return { text: '(Unable to display)', truncated: false };
         }
     }
     return { text: compactRunnerText(text, limit), truncated: text.length > limit };

package/dist/util/runner-native-session-parsers.d.ts

@@ -25,7 +25,6 @@ export declare function extractCodexThreads(result: unknown): readonly {
     readonly title: string | undefined;
 }[];
 export declare function codexThreadActivity(result: unknown): SessionActivityState;
-export declare function externalResumeFailureDetail(error: unknown): string;
 export declare function codexActiveTurnId(result: unknown): string | undefined;
 export declare function codexThreadCwd(value: unknown): string;
 export declare function isWithinWorkspace(cwd: string, workspacePath: string): boolean;
@@ -46,8 +45,8 @@ export declare function nativeConversationPage(session: NodeAgentSession, histor
     readonly nextCursor: string | null;
 };
 /**
- * Claude JSONL 不保存浏览器请求 ID。Node 进程仍存活时，以正文和生成时刻
- * 对齐当前运行态的用户消息，让 native 历史页替换同一乐观 Turn，而不是重复一条。
+ * Claude JSONL does not retain browser request IDs. While the Node process is alive, match current
+ * runtime user messages by content and creation time so native history replaces the optimistic Turn.
  */
 export declare function nativeUserClientMessageId(entry: Extract<NativeSessionHistory['items'][number], {
     readonly kind: 'message';

package/dist/util/runner-native-session-parsers.js

@@ -69,15 +69,6 @@ export function codexThreadActivity(result) {
         return 'IDLE';
     return 'UNAVAILABLE';
 }
-export function externalResumeFailureDetail(error) {
-    const message = error instanceof Error ? error.message : 'SESSION_RESUME_REJECTED';
-    return [...message]
-        .map((character) => (character <= '\u001f' || character === '\u007f' ? ' ' : character))
-        .join('')
-        .replace(/\s+/g, ' ')
-        .trim()
-        .slice(0, 240);
-}
 export function codexActiveTurnId(result) {
     if (!isPlainRecord(result) ||
         !isPlainRecord(result.thread) ||
@@ -228,8 +219,8 @@ function nativeTranscriptConversationItem(session, entry, index, turnId, runtime
     const clientMessageId = entry.kind === 'message' && entry.role === 'USER'
         ? nativeUserClientMessageId(entry, time, runtimeTurns)
         : null;
-    // Claude 标签式 Plan Mode：用户正文剥离注入的规划指令标签，
-    // 完整的 <proposed_plan> Agent 文本归一化为计划卡。
+    // Claude tagged Plan Mode strips the injected planning instruction label from user content
+    // and normalizes a complete <proposed_plan> Agent response into a plan card.
     const entryText = entry.kind === 'message'
         ? entry.role === 'USER'
             ? stripClaudePlanTag(entry.text)
@@ -304,8 +295,8 @@ function nativeTranscriptConversationItem(session, entry, index, turnId, runtime
     return item;
 }
 /**
- * Claude JSONL 不保存浏览器请求 ID。Node 进程仍存活时，以正文和生成时刻
- * 对齐当前运行态的用户消息，让 native 历史页替换同一乐观 Turn，而不是重复一条。
+ * Claude JSONL does not retain browser request IDs. While the Node process is alive, match current
+ * runtime user messages by content and creation time so native history replaces the optimistic Turn.
  */
 export function nativeUserClientMessageId(entry, createdAt, runtimeTurns) {
     for (const turn of runtimeTurns) {
@@ -314,7 +305,7 @@ export function nativeUserClientMessageId(entry, createdAt, runtimeTurns) {
             continue;
         const payload = user.payload;
         const clientMessageId = typeof payload.clientMessageId === 'string' ? payload.clientMessageId : null;
-        // 标签式 Plan Mode 的指令标签只存在于原生 transcript，运行态气泡始终是原文。
+        // Tagged Plan Mode instruction labels exist only in native transcripts; runtime bubbles retain the original content.
         if (clientMessageId === null || payload.text !== stripClaudePlanTag(entry.text))
             continue;
         const runtimeCreatedAt = user.startedAt ?? turn.startedAt;

package/dist/util/safe-error.d.ts

@@ -0,0 +1,2 @@
+/** Returns only a stable public error code, never a raw runtime exception message. */
+export declare function safeErrorCode(error: unknown, fallback: string): string;

package/dist/util/safe-error.js

@@ -0,0 +1,5 @@
+const STABLE_ERROR_CODE = /^[A-Z][A-Z0-9_]{0,127}$/u;
+/** Returns only a stable public error code, never a raw runtime exception message. */
+export function safeErrorCode(error, fallback) {
+    return error instanceof Error && STABLE_ERROR_CODE.test(error.message) ? error.message : fallback;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/node",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "MyAgentRoam Node runtime CLI.",
   "type": "module",
   "files": [
@@ -24,7 +24,7 @@
     "node-pty": "1.1.0",
     "ws": "^8.21.3",
     "zod": "4.4.3",
-    "@myagentroam/protocol": "^0.9.0"
+    "@myagentroam/protocol": "^0.9.2"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"