@fleetagent/pi-coding-agent 0.0.5 → 0.0.7

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

@@ -125,6 +125,7 @@ export class InteractiveMode {
     version;
     isInitialized = false;
     onInputCallback;
+    pendingUserInputs = [];
     loadingAnimation = undefined;
     workingMessage = undefined;
     workingVisible = true;
@@ -327,9 +328,10 @@ export class InteractiveMode {
             description: this.prefixAutocompleteDescription(cmd.description, cmd.sourceInfo),
             getArgumentCompletions: cmd.getArgumentCompletions,
         }));
-        // Build skill commands from session.skills (if enabled)
+        // Build skill/rule commands from loaded resources (if enabled)
         this.skillCommands.clear();
         const skillCommandList = [];
+        const ruleCommandList = [];
         if (this.settingsManager.getEnableSkillCommands()) {
             for (const skill of this.session.resourceLoader.getSkills().skills) {
                 const commandName = `skill:${skill.name}`;
@@ -339,8 +341,15 @@ export class InteractiveMode {
                     description: this.prefixAutocompleteDescription(skill.description, skill.sourceInfo),
                 });
             }
+            for (const rule of this.session.resourceLoader.getRules().rules) {
+                const commandName = `rule:${rule.name}`;
+                ruleCommandList.push({
+                    name: commandName,
+                    description: this.prefixAutocompleteDescription(rule.description, rule.sourceInfo),
+                });
+            }
         }
-        return new CombinedAutocompleteProvider([...slashCommands, ...templateCommands, ...extensionCommands, ...skillCommandList], this.activeSession.getCwd(), this.fdPath);
+        return new CombinedAutocompleteProvider([...slashCommands, ...templateCommands, ...extensionCommands, ...skillCommandList, ...ruleCommandList], this.activeSession.getCwd(), this.fdPath);
     }
     setupAutocompleteProvider() {
         let provider = this.createBaseAutocompleteProvider();
@@ -970,6 +979,7 @@ export class InteractiveMode {
             this.chatContainer.addChild(new Spacer(1));
         };
         const skillsResult = this.session.resourceLoader.getSkills();
+        const rulesResult = this.session.resourceLoader.getRules();
         const promptsResult = this.session.resourceLoader.getPrompts();
         const themesResult = this.session.resourceLoader.getThemes();
         const extensions = options?.extensions ??
@@ -988,6 +998,11 @@ export class InteractiveMode {
                 sourceInfos.set(skill.filePath, skill.sourceInfo);
             }
         }
+        for (const rule of rulesResult.rules) {
+            if (rule.sourceInfo) {
+                sourceInfos.set(rule.filePath, rule.sourceInfo);
+            }
+        }
         for (const prompt of promptsResult.prompts) {
             if (prompt.sourceInfo) {
                 sourceInfos.set(prompt.filePath, prompt.sourceInfo);
@@ -1018,6 +1033,16 @@ export class InteractiveMode {
                 const skillCompactList = formatCompactList(skills.map((skill) => skill.name));
                 addLoadedSection("Skills", skillCompactList, skillList);
             }
+            const rules = rulesResult.rules;
+            if (rules.length > 0) {
+                const groups = this.buildScopeGroups(rules.map((rule) => ({ path: rule.filePath, sourceInfo: rule.sourceInfo })));
+                const ruleList = this.formatScopeGroups(groups, {
+                    formatPath: (item) => this.formatDisplayPath(item.path),
+                    formatPackagePath: (item) => this.getShortPath(item.path, item.sourceInfo),
+                });
+                const ruleCompactList = formatCompactList(rules.map((rule) => rule.name));
+                addLoadedSection("Rules", ruleCompactList, ruleList);
+            }
             const templates = this.session.promptTemplates;
             if (templates.length > 0) {
                 const groups = this.buildScopeGroups(templates.map((template) => ({ path: template.filePath, sourceInfo: template.sourceInfo })));
@@ -1067,6 +1092,12 @@ export class InteractiveMode {
                 this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Skill conflicts]")}\n${warningLines}`, 0, 0));
                 this.chatContainer.addChild(new Spacer(1));
             }
+            const ruleDiagnostics = rulesResult.diagnostics;
+            if (ruleDiagnostics.length > 0) {
+                const warningLines = this.formatDiagnostics(ruleDiagnostics, sourceInfos);
+                this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Rule conflicts]")}\n${warningLines}`, 0, 0));
+                this.chatContainer.addChild(new Spacer(1));
+            }
             const promptDiagnostics = promptsResult.diagnostics;
             if (promptDiagnostics.length > 0) {
                 const warningLines = this.formatDiagnostics(promptDiagnostics, sourceInfos);
@@ -2128,6 +2159,9 @@ export class InteractiveMode {
             if (this.onInputCallback) {
                 this.onInputCallback(text);
             }
+            else {
+                this.pendingUserInputs.push(text);
+            }
             this.editor.addToHistory?.(text);
         };
     }
@@ -2606,6 +2640,10 @@ export class InteractiveMode {
         }
     }
     async getUserInput() {
+        const queuedInput = this.pendingUserInputs.shift();
+        if (queuedInput !== undefined) {
+            return queuedInput;
+        }
         return new Promise((resolve) => {
             this.onInputCallback = (text) => {
                 this.onInputCallback = undefined;
@@ -2641,11 +2679,27 @@ export class InteractiveMode {
      * repaint the final frame while the process is exiting.
      */
     isShuttingDown = false;
-    async shutdown() {
+    async shutdown(options) {
         if (this.isShuttingDown)
             return;
         this.isShuttingDown = true;
         this.unregisterSignalHandlers();
+        if (options?.fromSignal) {
+            // Signal-triggered shutdown (SIGTERM/SIGHUP). Emit extension cleanup
+            // (session_shutdown) BEFORE touching the terminal. Extension teardown
+            // such as removing sockets does not write to the tty, so it must not be
+            // skipped if a later terminal-restore write fails on a dead or stalled
+            // terminal. If the terminal is gone, the restore writes below emit EIO,
+            // which the stdout/stderr error handler turns into emergencyTerminalExit;
+            // the render loop is already idle, so this cannot hot-spin (see #4144).
+            await this.runtimeHost.dispose();
+            await this.ui.terminal.drainInput(1000);
+            this.stop();
+            process.exit(0);
+        }
+        // Interactive quit (Ctrl+D, Ctrl+C, /quit, extension shutdown()). Stop the
+        // TUI before emitting shutdown events so extension UI cleanup cannot repaint
+        // the final frame while the process is exiting.
         // Drain any in-flight Kitty key release events before stopping.
         // This prevents escape sequences from leaking to the parent shell over slow SSH.
         await this.ui.terminal.drainInput(1000);
@@ -2709,11 +2763,12 @@ export class InteractiveMode {
         }
         for (const signal of signals) {
             const handler = () => {
-                if (signal === "SIGHUP") {
-                    this.emergencyTerminalExit();
-                }
+                // SIGHUP no longer hard-exits: graceful shutdown emits session_shutdown
+                // first, then attempts terminal restore. A genuinely dead terminal
+                // surfaces as an EIO on the restore writes, which the stdout/stderr
+                // error handler converts into emergencyTerminalExit (see #4144, #5080).
                 killTrackedDetachedChildren();
-                void this.shutdown();
+                void this.shutdown({ fromSignal: true });
             };
             process.prependListener(signal, handler);
             this.signalCleanupHandlers.push(() => process.off(signal, handler));
@@ -4041,7 +4096,7 @@ export class InteractiveMode {
         const borderColor = (s) => theme.fg("border", s);
         reloadBox.addChild(new DynamicBorder(borderColor));
         reloadBox.addChild(new Spacer(1));
-        reloadBox.addChild(new Text(theme.fg("muted", "Reloading keybindings, extensions, skills, prompts, themes..."), 1, 0));
+        reloadBox.addChild(new Text(theme.fg("muted", "Reloading keybindings, extensions, skills, rules, prompts, themes..."), 1, 0));
         reloadBox.addChild(new Spacer(1));
         reloadBox.addChild(new DynamicBorder(borderColor));
         const previousEditor = this.editor;
@@ -4093,7 +4148,7 @@ export class InteractiveMode {
             if (modelsJsonError) {
                 this.showError(`models.json error: ${modelsJsonError}`);
             }
-            this.showStatus("Reloaded keybindings, extensions, skills, prompts, themes");
+            this.showStatus("Reloaded keybindings, extensions, skills, rules, prompts, themes");
         }
         catch (error) {
             dismissReloadBox(previousEditor);