@fleetagent/pi-coding-agent 0.0.10 → 0.0.12

package/dist/core/agent-session.js

@@ -13,7 +13,7 @@
  * Modes use this class and add their own I/O layer on top.
  */
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { basename, dirname } from "node:path";
+import { basename, dirname, sep } from "node:path";
 import { clampThinkingLevel, cleanupSessionResources, getSupportedThinkingLevels, isContextOverflow, modelsAreEqual, resetApiProviders, streamSimple, validateToolArguments, } from "@fleetagent/pi-ai";
 import { theme } from "../modes/interactive/theme/theme.js";
 import { stripFrontmatter } from "../utils/frontmatter.js";
@@ -30,10 +30,10 @@ import { emitSessionShutdownEvent } from "./extensions/runner.js";
 import { STRUCTURED_RESPONSE_INTERNAL_CUSTOM_TYPE } from "./messages.js";
 import { expandPromptTemplate } from "./prompt-templates.js";
 import { CURRENT_SESSION_VERSION, getLatestCompactionEntry } from "./session-manager.js";
-import { createSyntheticSourceInfo } from "./source-info.js";
+import { createSyntheticSourceInfo, getSourceBackend } from "./source-info.js";
 import { buildSystemPrompt } from "./system-prompt.js";
 import { createLocalBashOperations } from "./tools/bash.js";
-import { createAllToolDefinitions, DeferredSshToolOperations, LocalToolOperations, } from "./tools/index.js";
+import { createAllToolDefinitions, DeferredRemoteToolOperations, LocalToolOperations, } from "./tools/index.js";
 import { createToolDefinitionFromAgentTool } from "./tools/tool-definition-wrapper.js";
 /**
  * Parse a skill block from message text.
@@ -134,6 +134,7 @@ export class AgentSession {
     _allowedToolNames;
     _baseToolsOverride;
     _toolOperations;
+    _localResourceToolOperations;
     _sessionStartEvent;
     _extensionUIContext;
     _extensionCommandContextActions;
@@ -180,18 +181,64 @@ export class AgentSession {
     get modelRegistry() {
         return this._modelRegistry;
     }
+    getToolOperations() {
+        const shellPath = this.settingsManager.getShellPath();
+        return this._toolOperations ?? createLocalBashOperations({ cwd: this.session.getCwd(), shellPath });
+    }
     getToolBackendInfo() {
-        return this._toolOperations?.getBackendInfo?.() ?? { type: "local", cwd: this._cwd };
+        return this.getToolOperations().getBackendInfo?.() ?? { type: "local", cwd: this._cwd };
+    }
+    _getLocalResourceToolOperations(shellPath) {
+        this._localResourceToolOperations ??= new LocalToolOperations(this._cwd, { shellPath });
+        return this._localResourceToolOperations;
+    }
+    _getReadOperationsForPath(absolutePath, shellPath) {
+        const isSameOrChild = (target, root) => {
+            const normalizedRoot = resolvePath(root);
+            if (target === normalizedRoot)
+                return true;
+            const prefix = normalizedRoot.endsWith(sep) ? normalizedRoot : `${normalizedRoot}${sep}`;
+            return target.startsWith(prefix);
+        };
+        const resources = [
+            ...this._resourceLoader.getSkills().skills.map((skill) => ({
+                path: skill.filePath,
+                baseDir: skill.baseDir,
+                sourceInfo: skill.sourceInfo,
+            })),
+            ...this._resourceLoader.getRules().rules.map((rule) => ({
+                path: rule.filePath,
+                baseDir: rule.baseDir,
+                sourceInfo: rule.sourceInfo,
+            })),
+            ...this._resourceLoader.getPrompts().prompts.map((prompt) => ({
+                path: prompt.filePath,
+                baseDir: dirname(prompt.filePath),
+                sourceInfo: prompt.sourceInfo,
+            })),
+        ];
+        for (const resource of resources) {
+            if (getSourceBackend(resource.sourceInfo) !== "local")
+                continue;
+            const resourcePath = resolvePath(resource.path);
+            const baseDir = resolvePath(resource.baseDir);
+            if (absolutePath === resourcePath || isSameOrChild(absolutePath, baseDir)) {
+                return this._getLocalResourceToolOperations(shellPath);
+            }
+        }
+        return undefined;
     }
-    async configureSshSandbox(options) {
-        if (!(this._toolOperations instanceof DeferredSshToolOperations)) {
-            throw new Error("SSH sandbox can only be configured when Pi is started with --ssh-deferred");
+    async configureRemoteSandbox(options) {
+        if (!(this._toolOperations instanceof DeferredRemoteToolOperations)) {
+            throw new Error("Remote backend can only be configured when Pi is started with --remote-deferred");
         }
-        return this._toolOperations.configure(options);
+        return options.type === "ssh"
+            ? this._toolOperations.configure({ remote: options.remote, cwd: options.cwd })
+            : this._toolOperations.configureRemote(options.url);
     }
-    clearSshSandbox() {
-        if (!(this._toolOperations instanceof DeferredSshToolOperations)) {
-            throw new Error("SSH sandbox can only be cleared when Pi is started with --ssh-deferred");
+    clearRemoteSandbox() {
+        if (!(this._toolOperations instanceof DeferredRemoteToolOperations)) {
+            throw new Error("Remote backend can only be cleared when Pi is started with --remote-deferred");
         }
         this._toolOperations.clear();
     }
@@ -554,6 +601,8 @@ export class AgentSession {
             this.abortBranchSummary();
             this.abortBash();
             this.agent.abort();
+            void this._localResourceToolOperations?.dispose?.();
+            this._localResourceToolOperations = undefined;
         }
         catch {
             // Dispose must succeed even if an abort hook throws.
@@ -1137,7 +1186,7 @@ export class AgentSession {
         if (!skill)
             return text; // Unknown skill, pass through
         try {
-            const content = readFileSync(skill.filePath, "utf-8");
+            const content = skill.content ?? readFileSync(skill.filePath, "utf-8");
             const body = stripFrontmatter(content).trim();
             const skillBlock = `<skill name="${skill.name}" location="${skill.filePath}">\nReferences are relative to ${skill.baseDir}.\n\n${body}\n</skill>`;
             return args ? `${skillBlock}\n\n${args}` : skillBlock;
@@ -1162,7 +1211,7 @@ export class AgentSession {
         if (!rule)
             return text; // Unknown rule, pass through
         try {
-            const content = readFileSync(rule.filePath, "utf-8");
+            const content = rule.content ?? readFileSync(rule.filePath, "utf-8");
             const body = stripFrontmatter(content).trim();
             const ruleBlock = `<rule name="${rule.name}" location="${rule.filePath}">\nReferences are relative to ${rule.baseDir}.\n\n${body}\n</rule>`;
             return args ? `${ruleBlock}\n\n${args}` : ruleBlock;
@@ -2063,6 +2112,7 @@ export class AgentSession {
         this.agent.state.model = refreshedModel;
     }
     _bindExtensionCore(runner) {
+        const getToolOperations = () => this.getToolOperations();
         const getCommands = () => {
             const extensionCommands = runner.getRegisteredCommands().map((command) => ({
                 name: command.invocationName,
@@ -2154,6 +2204,14 @@ export class AgentSession {
                 this._requestExtensionCompaction(options);
             },
             getSystemPrompt: () => this.systemPrompt,
+            getToolOperations,
+            getToolBackendInfo: () => this.getToolBackendInfo(),
+            execToolBackend: (command, options) => {
+                const operations = getToolOperations();
+                const prefix = this.settingsManager.getShellCommandPrefix();
+                const resolvedCommand = prefix ? `${prefix}\n${command}` : command;
+                return executeBashWithOperations(resolvedCommand, options?.cwd ?? operations.cwd, operations, options);
+            },
         }, {
             registerProvider: (name, config) => {
                 this._modelRegistry.registerProvider(name, config);
@@ -2252,7 +2310,10 @@ export class AgentSession {
                 createToolDefinitionFromAgentTool(tool),
             ]))
             : createAllToolDefinitions(operations, {
-                read: { autoResizeImages },
+                read: {
+                    autoResizeImages,
+                    operationsForPath: (path) => this._getReadOperationsForPath(path, shellPath),
+                },
                 bash: { commandPrefix: shellCommandPrefix },
             });
         this._baseToolDefinitions = new Map(Object.entries(baseToolDefinitions).map(([name, tool]) => [name, tool]));