@fleetagent/pi-coding-agent 0.0.9 → 0.0.11

package/dist/core/agent-session.js

@@ -33,7 +33,7 @@ import { CURRENT_SESSION_VERSION, getLatestCompactionEntry } from "./session-man
 import { createSyntheticSourceInfo } from "./source-info.js";
 import { buildSystemPrompt } from "./system-prompt.js";
 import { createLocalBashOperations } from "./tools/bash.js";
-import { createAllToolDefinitions } from "./tools/index.js";
+import { createAllToolDefinitions, DeferredSshToolOperations, LocalToolOperations, } from "./tools/index.js";
 import { createToolDefinitionFromAgentTool } from "./tools/tool-definition-wrapper.js";
 /**
  * Parse a skill block from message text.
@@ -133,6 +133,7 @@ export class AgentSession {
     _initialActiveToolNames;
     _allowedToolNames;
     _baseToolsOverride;
+    _toolOperations;
     _sessionStartEvent;
     _extensionUIContext;
     _extensionCommandContextActions;
@@ -163,6 +164,7 @@ export class AgentSession {
         this._initialActiveToolNames = config.initialActiveToolNames;
         this._allowedToolNames = config.allowedToolNames ? new Set(config.allowedToolNames) : undefined;
         this._baseToolsOverride = config.baseToolsOverride;
+        this._toolOperations = config.toolOperations;
         this._sessionStartEvent = config.sessionStartEvent ?? { type: "session_start", reason: "startup" };
         // Always subscribe to agent events for internal handling
         // (session persistence, extensions, auto-compaction, retry logic)
@@ -178,6 +180,25 @@ 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.getToolOperations().getBackendInfo?.() ?? { type: "local", cwd: this._cwd };
+    }
+    async configureSshSandbox(options) {
+        if (!(this._toolOperations instanceof DeferredSshToolOperations)) {
+            throw new Error("SSH sandbox can only be configured when Pi is started with --ssh-deferred");
+        }
+        return this._toolOperations.configure(options);
+    }
+    clearSshSandbox() {
+        if (!(this._toolOperations instanceof DeferredSshToolOperations)) {
+            throw new Error("SSH sandbox can only be cleared when Pi is started with --ssh-deferred");
+        }
+        this._toolOperations.clear();
+    }
     async _getRequiredRequestAuth(model) {
         const result = await this._modelRegistry.getApiKeyAndHeaders(model);
         if (!result.ok) {
@@ -709,7 +730,7 @@ export class AgentSession {
         const loadedRules = this._resourceLoader.getRules().rules;
         const loadedContextFiles = this._resourceLoader.getAgentsFiles().agentsFiles;
         this._baseSystemPromptOptions = {
-            cwd: this._cwd,
+            cwd: this._toolOperations?.cwd ?? this._cwd,
             skills: loadedSkills,
             rules: loadedRules,
             contextFiles: loadedContextFiles,
@@ -1120,7 +1141,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;
@@ -1145,7 +1166,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;
@@ -2046,6 +2067,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,
@@ -2137,6 +2159,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);
@@ -2228,14 +2258,15 @@ export class AgentSession {
         const autoResizeImages = this.settingsManager.getImageAutoResize();
         const shellCommandPrefix = this.settingsManager.getShellCommandPrefix();
         const shellPath = this.settingsManager.getShellPath();
+        const operations = this._toolOperations ?? new LocalToolOperations(this._cwd, { shellPath });
         const baseToolDefinitions = this._baseToolsOverride
             ? Object.fromEntries(Object.entries(this._baseToolsOverride).map(([name, tool]) => [
                 name,
                 createToolDefinitionFromAgentTool(tool),
             ]))
-            : createAllToolDefinitions(this._cwd, {
+            : createAllToolDefinitions(operations, {
                 read: { autoResizeImages },
-                bash: { commandPrefix: shellCommandPrefix, shellPath },
+                bash: { commandPrefix: shellCommandPrefix },
             });
         this._baseToolDefinitions = new Map(Object.entries(baseToolDefinitions).map(([name, tool]) => [name, tool]));
         const extensionsResult = this._resourceLoader.getExtensions();
@@ -2381,7 +2412,7 @@ export class AgentSession {
      * @param command The bash command to execute
      * @param onChunk Optional streaming callback for output
      * @param options.excludeFromContext If true, command output won't be sent to LLM (!! prefix)
-     * @param options.operations Custom BashOperations for remote execution
+     * @param options.operations Custom ToolOperations for remote execution
      */
     async executeBash(command, onChunk, options) {
         this._bashAbortController = new AbortController();
@@ -2390,7 +2421,10 @@ export class AgentSession {
         const shellPath = this.settingsManager.getShellPath();
         const resolvedCommand = prefix ? `${prefix}\n${command}` : command;
         try {
-            const result = await executeBashWithOperations(resolvedCommand, this.session.getCwd(), options?.operations ?? createLocalBashOperations({ shellPath }), {
+            const operations = options?.operations ??
+                this._toolOperations ??
+                createLocalBashOperations({ cwd: this.session.getCwd(), shellPath });
+            const result = await executeBashWithOperations(resolvedCommand, operations.cwd, operations, {
                 onChunk,
                 signal: this._bashAbortController.signal,
             });