@myagentroam/node 0.9.2 → 0.9.4

package/dist/util/runner-error.js

@@ -0,0 +1,52 @@
+const MAX_RUNNER_ERROR_MESSAGE = 1000;
+export function runnerErrorProjection(error, fallbackCode) {
+    const httpStatus = findHttpStatus(error);
+    const message = findMessage(error) ?? fallbackCode;
+    return {
+        code: httpStatus === null ? fallbackCode : `HTTP_${httpStatus}`,
+        message: message.slice(0, MAX_RUNNER_ERROR_MESSAGE),
+        httpStatus
+    };
+}
+function findHttpStatus(value, depth = 0) {
+    if (depth > 3 || value === null || typeof value !== 'object')
+        return null;
+    const record = value;
+    for (const key of ['status', 'statusCode', 'status_code', 'httpStatus', 'http_status']) {
+        const candidate = record[key];
+        if (((typeof candidate === 'number' && Number.isInteger(candidate)) ||
+            (typeof candidate === 'string' && /^\d{3}$/u.test(candidate))) &&
+            Number(candidate) >= 100 &&
+            Number(candidate) <= 599)
+            return Number(candidate);
+    }
+    const match = findMessage(value)?.match(/(?:^|\b(?:http(?:\s+status)?|status(?:\s+code)?|error)\s*[:=_-]?\s*)([1-5]\d{2})\b/iu);
+    if (match !== null && match !== undefined)
+        return Number(match[1]);
+    for (const key of ['error', 'cause', 'response', 'data']) {
+        const nested = findHttpStatus(record[key], depth + 1);
+        if (nested !== null)
+            return nested;
+    }
+    return null;
+}
+function findMessage(value, depth = 0) {
+    if (typeof value === 'string')
+        return value.trim() || undefined;
+    if (value instanceof Error && value.message.trim())
+        return value.message.trim();
+    if (depth > 3 || value === null || typeof value !== 'object')
+        return undefined;
+    const record = value;
+    for (const key of ['message', 'error_description', 'detail', 'result']) {
+        const candidate = record[key];
+        if (typeof candidate === 'string' && candidate.trim())
+            return candidate.trim();
+    }
+    for (const key of ['error', 'cause', 'response', 'data']) {
+        const nested = findMessage(record[key], depth + 1);
+        if (nested !== undefined)
+            return nested;
+    }
+    return undefined;
+}

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

@@ -15,6 +15,7 @@ export interface ConversationHistoryPage {
     readonly source: ConversationHistorySource;
     readonly readAt: number;
     readonly latestVisibleAt: number;
+    readonly deferredOlderHistory?: boolean;
 }
 export declare function extractId(result: unknown, key: 'thread' | 'turn'): string;
 export declare function settleWithin<T>(promise: Promise<T>, milliseconds: number): Promise<T | undefined>;
@@ -50,7 +51,7 @@ export declare function nativeConversationPage(session: NodeAgentSession, histor
  */
 export declare function nativeUserClientMessageId(entry: Extract<NativeSessionHistory['items'][number], {
     readonly kind: 'message';
-}>, createdAt: number, runtimeTurns: readonly NodeConversationTurn[]): string | null;
+}>, createdAt: number | null, runtimeTurns: readonly NodeConversationTurn[]): string | null;
 /**
  * Normalize the documented App Server `thread/read(includeTurns: true)`
  * result.  Only items with a user-visible Workbench representation are kept;

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

@@ -146,23 +146,53 @@ export function deduplicateDirectSessions(sessions) {
 export function nativeConversationPage(session, history, input, runtimeTurns = [], registerImages = () => []) {
     const limit = Math.min(Math.max(input.limit ?? 30, 1), 500);
     const nativeTurns = nativeTranscriptTurns(history.items);
+    const representedClientMessageIds = new Set(nativeTurns.flatMap((entries) => entries.flatMap(({ entry, index }) => {
+        if (entry.kind !== 'message' || entry.role !== 'USER')
+            return [];
+        const clientMessageId = nativeUserClientMessageId(entry, entry.createdAt ?? index, runtimeTurns);
+        return clientMessageId === null ? [] : [clientMessageId];
+    })));
+    const missingRuntimeErrorTurns = input.cursor === undefined
+        ? runtimeTurns.filter((turn) => {
+            const clientMessageId = runtimeTurnClientMessageId(turn);
+            return (turn.items.some((item) => item.kind === 'error') &&
+                (clientMessageId === undefined || !representedClientMessageIds.has(clientMessageId)));
+        })
+        : [];
     const end = nativePageEnd(input.cursor, session.id, nativeTurns.length);
     const start = Math.max(0, end - limit);
-    const turns = nativeTurns
+    const nativePageTurns = nativeTurns
         .slice(start, end)
         .map((entries, relativeIndex) => {
         const firstIndex = entries[0]?.index ?? 0;
-        const turnId = `${session.id}:native:${firstIndex}`;
-        const items = entries.map(({ entry, index }) => nativeTranscriptConversationItem(session, entry, index, turnId, runtimeTurns, registerImages));
-        const startedAt = items[0]?.startedAt ?? firstIndex;
+        const nativeUser = entries.find(({ entry }) => entry.kind === 'message' && entry.role === 'USER')?.entry;
+        const matchedClientMessageId = nativeUser?.kind === 'message'
+            ? nativeUserClientMessageId(nativeUser, nativeUser.createdAt, runtimeTurns)
+            : null;
+        const runtimeTurn = typeof matchedClientMessageId === 'string'
+            ? runtimeTurns.find((turn) => runtimeTurnClientMessageId(turn) === matchedClientMessageId)
+            : undefined;
+        const turnId = runtimeTurn?.id ?? `${session.id}:native:${firstIndex}`;
+        const nativeItems = entries.map(({ entry, index }) => ({
+            ...nativeTranscriptConversationItem(session, entry, index, turnId, runtimeTurns, registerImages),
+            runId: runtimeTurn?.runId ?? null
+        }));
+        const runtimeErrors = (runtimeTurn?.items ?? [])
+            .filter((item) => item.kind === 'error')
+            .map((item) => ({ ...item, turnId, runId: runtimeTurn?.runId ?? null }));
+        const items = [
+            ...nativeItems,
+            ...runtimeErrors.filter((error) => !nativeItems.some((item) => item.id === error.id))
+        ];
+        const startedAt = items[0]?.startedAt ?? null;
         const completedAt = items.at(-1)?.completedAt ?? startedAt;
         const after = lastNativeItemId(entries);
         return {
             id: turnId,
             sessionId: session.id,
-            runId: null,
+            runId: runtimeTurn?.runId ?? null,
             userItemId: items.find((item) => item.kind === 'user_message')?.id ?? null,
-            status: 'SUCCEEDED',
+            status: runtimeErrors.length > 0 ? 'FAILED' : 'SUCCEEDED',
             model: null,
             effort: null,
             access: null,
@@ -179,13 +209,24 @@ export function nativeConversationPage(session, history, input, runtimeTurns = [
             completedAt
         };
     });
+    const combined = [...nativePageTurns, ...missingRuntimeErrorTurns];
+    const dropped = combined.slice(0, Math.max(0, combined.length - limit));
+    const turns = combined.slice(-limit);
+    const nativePageIds = new Set(nativePageTurns.map((turn) => turn.id));
+    const nextEnd = start + dropped.filter((turn) => nativePageIds.has(turn.id)).length;
     return {
         turns,
-        nextCursor: start > 0
-            ? Buffer.from(JSON.stringify({ sessionId: session.id, end: start })).toString('base64url')
+        nextCursor: nextEnd > 0
+            ? Buffer.from(JSON.stringify({ sessionId: session.id, end: nextEnd })).toString('base64url')
             : null
     };
 }
+function runtimeTurnClientMessageId(turn) {
+    const user = turn.items.find((item) => item.kind === 'user_message');
+    return isPlainRecord(user?.payload) && typeof user.payload.clientMessageId === 'string'
+        ? user.payload.clientMessageId
+        : undefined;
+}
 function lastNativeItemId(entries) {
     return entries.findLast(({ entry }) => entry.nativeId !== undefined)?.entry.nativeId;
 }
@@ -204,7 +245,7 @@ function nativeTranscriptTurns(items) {
     return turns;
 }
 function nativeTranscriptConversationItem(session, entry, index, turnId, runtimeTurns, registerImages) {
-    const time = entry.createdAt ?? index;
+    const time = entry.createdAt;
     const isToolCall = entry.kind === 'tool_call';
     const isUnknown = entry.kind === 'unknown';
     const isReasoning = entry.kind === 'reasoning_summary';
@@ -299,6 +340,7 @@ function nativeTranscriptConversationItem(session, entry, index, turnId, runtime
  * runtime user messages by content and creation time so native history replaces the optimistic Turn.
  */
 export function nativeUserClientMessageId(entry, createdAt, runtimeTurns) {
+    const candidates = [];
     for (const turn of runtimeTurns) {
         const user = turn.items.find((item) => item.kind === 'user_message');
         if (user === undefined || !isPlainRecord(user.payload))
@@ -309,13 +351,19 @@ export function nativeUserClientMessageId(entry, createdAt, runtimeTurns) {
         if (clientMessageId === null || payload.text !== stripClaudePlanTag(entry.text))
             continue;
         const runtimeCreatedAt = user.startedAt ?? turn.startedAt;
-        if (runtimeCreatedAt !== null &&
-            runtimeCreatedAt !== undefined &&
-            Math.abs(createdAt - runtimeCreatedAt) > 60_000)
-            continue;
-        return clientMessageId;
+        candidates.push({ clientMessageId, createdAt: runtimeCreatedAt ?? null });
     }
-    return null;
+    if (createdAt === null)
+        return candidates.length === 1 ? candidates[0].clientMessageId : null;
+    const timed = candidates
+        .filter((candidate) => candidate.createdAt !== null)
+        .map((candidate) => ({
+        ...candidate,
+        distance: Math.abs(createdAt - candidate.createdAt)
+    }))
+        .filter((candidate) => candidate.distance <= 60_000)
+        .sort((left, right) => left.distance - right.distance);
+    return timed[0]?.clientMessageId ?? null;
 }
 /**
  * Normalize the documented App Server `thread/read(includeTurns: true)`

package/dist/workspace.js

@@ -1232,14 +1232,7 @@ export async function readCurrentChanges(workspacePath) {
 export async function readCurrentChangeDiff(workspacePath, requestedPath) {
     const path = safeGitWorkspacePath(requestedPath);
     await assertCurrentChangePathAccessible(workspacePath, path);
-    const result = await runGit(workspacePath, [
-        'diff',
-        '--no-ext-diff',
-        '--no-textconv',
-        'HEAD',
-        '--',
-        `:(literal)${path}`
-    ]);
+    const result = await readCurrentChangeGitDiff(workspacePath, path);
     const after = await readWorkingTreeText(workspacePath, path);
     const binary = result.output.includes(0) || result.text.includes('Binary files ') || after?.binary === true;
     if (binary) {
@@ -1263,6 +1256,38 @@ export async function readCurrentChangeDiff(workspacePath, requestedPath) {
         ...(after === undefined ? {} : { afterTruncated: after.truncated })
     };
 }
+async function readCurrentChangeGitDiff(workspacePath, path) {
+    const untracked = await runGit(workspacePath, [
+        'ls-files',
+        '--others',
+        '--exclude-standard',
+        '-z',
+        '--',
+        `:(literal)${path}`
+    ]);
+    if (untracked.text.split('\0').includes(path)) {
+        const result = await runGitAllowFailure(workspacePath, [
+            'diff',
+            '--no-index',
+            '--no-ext-diff',
+            '--no-textconv',
+            '--',
+            '/dev/null',
+            path
+        ]);
+        if (result.code !== 0 && result.code !== 1)
+            throw new GitCommandError(result.code, result.stderr);
+        return result;
+    }
+    return runGit(workspacePath, [
+        'diff',
+        '--no-ext-diff',
+        '--no-textconv',
+        'HEAD',
+        '--',
+        `:(literal)${path}`
+    ]);
+}
 /** Current Changes must not expose an external link. */
 export async function isWorkspaceChangeVisible(workspacePath, requestedPath) {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/node",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "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.2"
+    "@myagentroam/protocol": "^0.9.4"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"