@oxecli/oxe 1.0.27 → 1.0.28

package/dist/cli.js

@@ -58,9 +58,8 @@ export class CLI {
             titleAlign: "left",
             colGap: 2,
         });
-        // Write the panel starting on a fresh line. No extra leading/trailing blank
-        // here — askBottomPrompt's own leading newline supplies the single gap.
-        process.stdout.write(panel + "\n");
+        // Keep one blank row between the previous response/footer and the panel.
+        process.stdout.write("\n" + panel + "\n");
         if (process.stdin.isTTY) {
             // Wait for a close key, then erase the panel (mirrors Python's Live).
             enableRawStdin();
@@ -336,6 +335,7 @@ export class CLI {
         for (;;) {
             engine.inQuery = false;
             let rawPrompt;
+            let queryStarted = false;
             try {
                 const [input, spans] = await askBottomPrompt("You", "❯", this.promptHistory);
                 if (!input.trim())
@@ -390,7 +390,9 @@ export class CLI {
                     continue;
                 }
                 process.stdout.write(`\n\x1b[1m❯\x1b[0m ${userDisplayText(input, spans)}\n\n`);
+                queryStarted = true;
                 await engine.executeQuery(input, this.inputItems, this.story, spans);
+                queryStarted = false;
                 this.saveSession(engine);
             }
             catch (err) {
@@ -401,7 +403,7 @@ export class CLI {
                     break;
                 }
                 if (err?.message === "interrupt") {
-                    const wasActive = engine.inQuery;
+                    const wasActive = queryStarted || engine.inQuery;
                     engine.inQuery = false;
                     // Drop the pending user message/story entry that was never run.
                     if (this.inputItems.length && this.inputItems[this.inputItems.length - 1]["role"] === "user") {
@@ -422,8 +424,8 @@ export class CLI {
                     // (mirrors Python's console.print()).
                     process.stdout.write("\n");
                     process.stdout.write(wasActive
-                        ? "\x1b[2mInterrupted. Press Ctrl+C again to exit, or type a new prompt.\x1b[0m\n"
-                        : "\x1b[2mNo active response. Press Ctrl+C again to exit.\x1b[0m\n");
+                        ? "\x1b[2mInterrupted agent. Press Ctrl+C again to close the app, or type a new prompt.\x1b[0m\n"
+                        : "\x1b[2mNo active response. Press Ctrl+C again to close the app, or type a new prompt.\x1b[0m\n");
                     continue;
                 }
                 throw err;
@@ -451,10 +453,19 @@ export async function main() {
     }
     app.config = config;
     const engine = new InferenceEngine(config);
+    const onInterrupt = () => {
+        if (engine.inQuery) {
+            engine.interrupt();
+            return;
+        }
+        process.exit(130);
+    };
+    process.on("SIGINT", onInterrupt);
     try {
         await app.replLoop(engine);
     }
     finally {
+        process.removeListener("SIGINT", onInterrupt);
         await engine.cleanupStoredResponses();
         const client = engine.client;
         if (typeof client?.close === "function")

package/dist/engine.js

@@ -47,6 +47,8 @@ export class InferenceEngine {
     workActive = false;
     workRows = 2;
     inQuery = false;
+    activeAbort = null;
+    interrupted = false;
     temperature;
     storedResponseIds = [];
     constructor(config) {
@@ -62,6 +64,10 @@ export class InferenceEngine {
         });
         this.temperature = config["temperature"] ?? null;
     }
+    interrupt() {
+        this.interrupted = true;
+        this.activeAbort?.abort();
+    }
     async cleanupStoredResponses() {
         const ids = this.storedResponseIds;
         this.storedResponseIds = [];
@@ -233,8 +239,12 @@ export class InferenceEngine {
                 kwargs["temperature"] = this.temperature;
             if (previousResponseId)
                 kwargs["previous_response_id"] = previousResponseId;
-            const stream = await this.client.responses.create(kwargs);
+            const stream = await this.client.responses.create(kwargs, {
+                signal: this.activeAbort?.signal,
+            });
             for await (const event of stream) {
+                if (this.interrupted)
+                    throw new Error("interrupt");
                 etype = event.type;
                 if (etype === "response.reasoning_text.delta" ||
                     etype === "response.reasoning.summary.delta") {
@@ -413,6 +423,8 @@ export class InferenceEngine {
     }
     async executeQuery(userPrompt, inputItems, story, pasteSpans) {
         this.inQuery = true;
+        this.interrupted = false;
+        this.activeAbort = new AbortController();
         hideCursor();
         inputItems.push({
             role: "user",
@@ -538,6 +550,8 @@ export class InferenceEngine {
                     if (c.name === "edit_file" || c.name === "write_file")
                         process.stdout.write("\n");
                     const rawResult = await this.runTool(c.name, c.arguments);
+                    if (this.interrupted)
+                        throw new Error("interrupt");
                     const failed = toolOutputFailed(c.name, rawResult);
                     const action = formatToolAction(c.name, c.arguments, failed ? "failed" : "ok");
                     story.push({ type: "tool", started, text: action, status: failed ? "failed" : "ok" });
@@ -568,6 +582,8 @@ export class InferenceEngine {
             stripOrphanCalls(inputItems);
         }
         catch (err) {
+            if (this.interrupted)
+                throw new Error("interrupt");
             if (err?.message === "interrupt" || err?.message === "eof") {
                 throw err;
             }
@@ -575,6 +591,7 @@ export class InferenceEngine {
         }
         finally {
             this.inQuery = false;
+            this.activeAbort = null;
             if (stats["tokens"] > 0 && this.keyData) {
                 const userId = this.keyData["user_id"];
                 if (userId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxecli/oxe",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "publishConfig": {
     "access": "public"
   },