@dyyz1993/pi-coding-agent 0.74.14 → 0.74.15

package/dist/modes/interactive/interactive-mode.js

@@ -12,6 +12,7 @@ import { spawn, spawnSync } from "child_process";
 import { APP_NAME, APP_TITLE, getAgentDir, getAuthPath, getDebugLogPath, getDocsPath, getShareViewerUrl, VERSION, } from "../../config.js";
 import { parseSkillBlock } from "../../core/agent-session.js";
 import { SessionImportFileNotFoundError } from "../../core/agent-session-runtime.js";
+import { resolveProjectIdentity, getSessionDataDir, getProjectDataDir, getCwdDataDir, getGlobalDataDir } from "../../core/storage.js";
 import { FooterDataProvider } from "../../core/footer-data-provider.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
 import { createCompactionSummaryMessage } from "../../core/messages.js";
@@ -1225,51 +1226,52 @@ export class InteractiveMode {
         if (shortcuts.size === 0)
             return;
         // Create a context for shortcut handlers
-        const createContext = () => ({
-            ui: this.createExtensionUIContext(),
-            hasUI: true,
-            cwd: this.sessionManager.getCwd(),
-            sessionManager: this.sessionManager,
-            modelRegistry: this.session.modelRegistry,
-            model: this.session.model,
-            isIdle: () => !this.session.isStreaming,
-            signal: this.session.agent.signal,
-            abort: () => this.session.abort(),
-            hasPendingMessages: () => this.session.pendingMessageCount > 0,
-            shutdown: () => {
-                this.shutdownRequested = true;
-            },
-            getContextUsage: () => this.session.getContextUsage(),
-            compact: (options) => {
-                void (async () => {
-                    try {
-                        const result = await this.session.compact(options?.customInstructions);
-                        options?.onComplete?.(result);
-                    }
-                    catch (error) {
-                        const err = error instanceof Error ? error : new Error(String(error));
-                        options?.onError?.(err);
-                    }
-                })();
-            },
-            getSystemPrompt: () => this.session.systemPrompt,
-            extensionName: "",
-            projectRoot: this.sessionManager.getCwd(),
-            sessionDataDir: "",
-            projectDataDir: "",
-            cwdDataDir: "",
-            globalDataDir: "",
-            sessionSignal: AbortSignal.abort(),
-            respondUI: () => { },
-            fileSnapshotManager: this.session.fileSnapshotManager,
-        });
+        const createContext = (extName) => {
+            const projectRoot = resolveProjectIdentity(this.sessionManager.getCwd());
+            return {
+                ui: this.createExtensionUIContext(),
+                hasUI: true,
+                cwd: this.sessionManager.getCwd(),
+                sessionManager: this.sessionManager,
+                modelRegistry: this.session.modelRegistry,
+                model: this.session.model,
+                isIdle: () => !this.session.isStreaming,
+                signal: this.session.agent.signal,
+                abort: () => this.session.abort(),
+                hasPendingMessages: () => this.session.pendingMessageCount > 0,
+                shutdown: () => {
+                    this.shutdownRequested = true;
+                },
+                getContextUsage: () => this.session.getContextUsage(),
+                compact: (options) => {
+                    void (async () => {
+                        try {
+                            const result = await this.session.compact(options?.customInstructions);
+                            options?.onComplete?.(result);
+                        }
+                        catch (error) {
+                            const err = error instanceof Error ? error : new Error(String(error));
+                            options?.onError?.(err);
+                        }
+                    })();
+                },
+                getSystemPrompt: () => this.session.systemPrompt,
+                extensionName: extName,
+                projectRoot,
+                sessionDataDir: getSessionDataDir(this.sessionManager.getSessionDir(), this.sessionManager.getSessionId(), extName),
+                projectDataDir: getProjectDataDir(projectRoot, extName),
+                cwdDataDir: getCwdDataDir(this.sessionManager.getCwd(), extName),
+                globalDataDir: getGlobalDataDir(extName),
+                sessionSignal: AbortSignal.abort(),
+                respondUI: () => { },
+                fileSnapshotManager: this.session.fileSnapshotManager,
+            };
+        };
         // Set up the extension shortcut handler on the default editor
         this.defaultEditor.onExtensionShortcut = (data) => {
             for (const [shortcutStr, shortcut] of shortcuts) {
-                // Cast to KeyId - extension shortcuts use the same format
                 if (matchesKey(data, shortcutStr)) {
-                    // Run handler async, don't block input
-                    Promise.resolve(shortcut.handler(createContext())).catch((err) => {
+                    Promise.resolve(shortcut.handler(createContext(shortcut.extensionName))).catch((err) => {
                         this.showError(`Shortcut handler error: ${err instanceof Error ? err.message : String(err)}`);
                     });
                     return true;