@myagentroam/node 0.11.0 → 0.11.2

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

@@ -1,5 +1,6 @@
 import { createHash } from 'node:crypto';
-import { listGitHistoryRefs, openGitHistoryFileContent, readGitHistory, readGitHistoryFileDiff, readGitHistoryFileContentRange, readGitHistoryFiles, readCurrentChangeDiff, readRestrictedDiff, resolveGitRepository, resolveGitRepositoryTarget, restoreCurrentChange } from '../workspace.js';
+import { isAbsolute, win32 } from 'node:path';
+import { listGitHistoryRefs, normalizeFilePreviewPath, openGitHistoryFileContent, readGitHistory, readGitHistoryFileDiff, readGitHistoryFileContentRange, readGitHistoryFiles, readCurrentChangeDiff, readRestrictedDiff, resolveGitRepository, resolveGitRepositoryTarget, resolveWorkspaceGitRoot, restoreCurrentChange } from '../workspace.js';
 import { WorkspaceCodeNavigationService } from './workspace-code-navigation-service.js';
 import { WorkspaceContentSearchService } from './workspace-content-search-service.js';
 import { WorkspaceWatchController } from './workspace-watch-controller.js';
@@ -98,7 +99,7 @@ export class WorkspaceWorkbenchService {
     }
     async readPredictionFile(workspaceId, path, worktreePath) {
         const workspace = this.options.requireWorkspace(workspaceId);
-        const repository = await this.fileRepository(workspace, worktreePath ? { worktreePath } : {});
+        const repository = await this.fileRepository(workspace, worktreePath ? { worktreePath, path } : {});
         const { readWorkspaceTextFile } = await import('../workspace.js');
         return readWorkspaceTextFile(repository, path, 0, 64 * 1024);
     }
@@ -180,7 +181,7 @@ export class WorkspaceWorkbenchService {
             (input.worktreePath !== undefined && typeof input.worktreePath !== 'string'))
             throw new Error('GIT_DIFF_INVALID');
         const workspace = this.gitWorkspace(input.workspaceId);
-        const repository = await resolveGitRepositoryTarget(workspace.path, input.repositoryPath ?? '', input.worktreePath);
+        const repository = await resolveGitRepositoryTarget(await resolveWorkspaceGitRoot(workspace.path, workspace.includeParentRepository ?? true), input.repositoryPath ?? '', input.worktreePath);
         return { diff: await readCurrentChangeDiff(repository, input.path) };
     }
     async restoreChange(input) {
@@ -191,7 +192,7 @@ export class WorkspaceWorkbenchService {
             (input.state !== 'STAGED' && input.state !== 'UNSTAGED' && input.state !== 'UNTRACKED'))
             throw new Error('GIT_CHANGE_RESTORE_UNAVAILABLE');
         const workspace = this.gitWorkspace(input.workspaceId);
-        const repository = await resolveGitRepositoryTarget(workspace.path, input.repositoryPath ?? '', input.worktreePath);
+        const repository = await resolveGitRepositoryTarget(await resolveWorkspaceGitRoot(workspace.path, workspace.includeParentRepository ?? true), input.repositoryPath ?? '', input.worktreePath);
         await restoreCurrentChange(repository, input.path, input.state);
         this.options.invalidate(workspace.id);
         return { restored: true };
@@ -201,14 +202,22 @@ export class WorkspaceWorkbenchService {
             (input.repositoryPath !== undefined && typeof input.repositoryPath !== 'string'))
             throw new Error('GIT_REPOSITORY_INVALID');
         const workspace = this.gitWorkspace(input.workspaceId);
-        return resolveGitRepository(workspace.path, input.repositoryPath ?? '');
+        return resolveGitRepository(await resolveWorkspaceGitRoot(workspace.path, workspace.includeParentRepository ?? true), input.repositoryPath ?? '');
     }
     async fileRepository(workspace, input) {
-        if (input.worktreePath === undefined)
+        if (input.worktreePath === undefined && input.repositoryPath === undefined)
             return workspace.path;
-        if (typeof input.worktreePath !== 'string')
+        if ((input.worktreePath !== undefined && typeof input.worktreePath !== 'string') ||
+            (input.repositoryPath !== undefined && typeof input.repositoryPath !== 'string'))
             throw new Error('GIT_REPOSITORY_INVALID');
-        return resolveGitRepositoryTarget(workspace.path, '', input.worktreePath);
+        if (typeof input.path !== 'string' ||
+            input.path.startsWith('mar-attachment:') ||
+            input.previewDirectory !== undefined)
+            throw new Error('FILE_PATH_ESCAPE');
+        const path = normalizeFilePreviewPath(input.path);
+        if (isAbsolute(path) || win32.isAbsolute(path))
+            throw new Error('FILE_PATH_ESCAPE');
+        return resolveGitRepositoryTarget(await resolveWorkspaceGitRoot(workspace.path, workspace.includeParentRepository ?? true), input.repositoryPath ?? '', input.worktreePath);
     }
     refs(input) {
         if (input.refs === undefined)
@@ -280,6 +289,9 @@ export class WorkspaceWorkbenchService {
             const input = {
                 workspaceId: workspace.id,
                 path: descriptor.resource.path,
+                ...(descriptor.resource.repositoryPath === undefined
+                    ? {}
+                    : { repositoryPath: descriptor.resource.repositoryPath }),
                 ...(descriptor.resource.worktreePath === undefined
                     ? {}
                     : { worktreePath: descriptor.resource.worktreePath })
@@ -372,12 +384,12 @@ export class WorkspaceWorkbenchService {
             typeof input.toRef !== 'string')
             throw new Error('GIT_DIFF_INVALID');
         const workspace = this.gitWorkspace(input.workspaceId);
-        return { diff: await readRestrictedDiff(workspace.path, input.fromRef, input.toRef) };
+        return {
+            diff: await readRestrictedDiff(await resolveWorkspaceGitRoot(workspace.path, workspace.includeParentRepository ?? true), input.fromRef, input.toRef)
+        };
     }
     gitWorkspace(workspaceId) {
         const workspace = this.options.requireWorkspace(workspaceId);
-        if (workspace.kind !== 'GIT_WORKSPACE')
-            throw new Error('WORKSPACE_NOT_GIT');
         return workspace;
     }
 }

package/dist/terminal.js

@@ -318,17 +318,14 @@ export class TerminalManager {
         const summary = this.notifySummary(terminal);
         try {
             if (terminal.pty !== undefined) {
-                if (this.platform === 'win32') {
-                    // Killing only the shell bypasses node-pty's native console cleanup.
-                    try {
-                        terminal.pty.kill();
-                    }
-                    catch {
-                        await this.terminate(terminal.pty, this.platform);
-                    }
+                // Native PTY hangup reaches POSIX foreground jobs in a separate process group
+                // and releases the native console on Windows; shell-group TERM cannot do this.
+                try {
+                    terminal.pty.kill();
                 }
-                else
+                catch {
                     await this.terminate(terminal.pty, this.platform);
+                }
             }
             if (terminal.pipe !== undefined)
                 await this.terminate(terminal.pipe, this.platform);
@@ -338,13 +335,17 @@ export class TerminalManager {
         }
         return summary;
     }
+    /** Ends current terminals without disposing the manager's idle collection. */
+    async closeAll() {
+        await Promise.all([...this.terminals.values()]
+            .filter((terminal) => terminal.state === 'RUNNING')
+            .map((terminal) => this.close(terminal.id)));
+    }
     async shutdown() {
         if (this.idleTimer !== undefined)
             clearInterval(this.idleTimer);
         this.idleTimer = undefined;
-        await Promise.all([...this.terminals.values()]
-            .filter((terminal) => terminal.state === 'RUNNING')
-            .map((terminal) => this.close(terminal.id)));
+        await this.closeAll();
     }
     onFrame(listener) {
         this.frameListeners.add(listener);

package/dist/workspace.js

@@ -1187,7 +1187,7 @@ export function isWithinAllowedRoot(target, roots, platform = hostPlatform()) {
     });
 }
 /** Resolving both candidate and roots rejects Linux symlinks which point outside a root. */
-export async function inspectWorkspace(requestedPath, allowedRoots) {
+export async function inspectWorkspace(requestedPath, allowedRoots, includeParentRepository = true) {
     const resolvedPath = await realpath(requestedPath);
     const resolvedRoots = await Promise.all(allowedRoots.map((root) => realpath(root)));
     const directory = await stat(resolvedPath);
@@ -1195,16 +1195,40 @@ export async function inspectWorkspace(requestedPath, allowedRoots) {
         throw new Error('WORKSPACE_NOT_ALLOWED');
     }
     try {
-        const summary = await readGitSummary(resolvedPath);
+        const repositoryRoot = await resolveWorkspaceGitRoot(resolvedPath, includeParentRepository);
+        const summary = { ...(await readGitSummary(repositoryRoot)), repositoryRoot };
         return { path: resolvedPath, kind: 'GIT_WORKSPACE', gitSummary: summary };
     }
     catch (error) {
-        if ((error instanceof GitCommandError && error.code === 128) || isGitUnavailable(error)) {
+        if ((error instanceof GitCommandError && error.code === 128) ||
+            isGitUnavailable(error) ||
+            (error instanceof Error && error.message === 'WORKSPACE_NOT_GIT')) {
             return { path: resolvedPath, kind: 'DIRECTORY' };
         }
         throw error;
     }
 }
+/** Resolves the working tree without changing the registered Workspace identity. */
+export async function resolveWorkspaceGitRoot(workspacePath, includeParentRepository = true) {
+    const workspace = await resolveRegisteredWorkspaceRoot(workspacePath);
+    if (!includeParentRepository) {
+        const marker = await lstat(resolve(workspace, '.git')).catch((error) => {
+            if (error.code === 'ENOENT')
+                return undefined;
+            throw error;
+        });
+        if (marker === undefined ||
+            marker.isSymbolicLink() ||
+            (!marker.isFile() && !marker.isDirectory()))
+            throw new Error('WORKSPACE_NOT_GIT');
+    }
+    const result = await runReadOnlyGit(workspace, ['rev-parse', '--show-toplevel']);
+    const root = await realpath(result.text.replace(/\n$/u, ''));
+    if (!includeParentRepository &&
+        normalizeWorkspacePath(root) !== normalizeWorkspacePath(workspace))
+        throw new Error('WORKSPACE_NOT_GIT');
+    return root;
+}
 export async function readGitSummary(workspacePath) {
     const commonDir = (await runReadOnlyGit(workspacePath, ['rev-parse', '--git-common-dir'])).text.trim();
     const headResult = await runReadOnlyGitAllowFailure(workspacePath, [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/node",
-  "version": "0.11.0",
+  "version": "0.11.2",
   "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.11.0",
+    "@myagentroam/agent": "0.11.2",
+    "@myagentroam/protocol": "0.11.2",
     "@myagentroam/marctl": "0.11.0",
-    "@myagentroam/code-navigation": "0.11.0",
-    "@myagentroam/protocol": "0.11.0"
+    "@myagentroam/code-navigation": "0.11.0"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"