kibi-cli 0.2.0 → 0.2.3

package/dist/prolog.d.ts

@@ -15,6 +15,7 @@ export declare class PrologProcess {
     private outputBuffer;
     private errorBuffer;
     private cache;
+    private interactiveQueryTail;
     private useOneShotMode;
     private attachedKbPath;
     private onProcessExit;

package/dist/prolog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prolog.d.ts","sourceRoot":"","sources":["../src/prolog.ts"],"names":[],"mappings":"AAuDA,wBAAgB,eAAe,IAAI,MAAM,CAsCxC;AACD,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,YAAY,CAAM;IAC1B,OAAO,CAAC,WAAW,CAAM;IACzB,OAAO,CAAC,KAAK,CAAuC;IACpD,OAAO,CAAC,cAAc,CACyC;IAC/D,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,aAAa,CAA6B;gBAEtC,OAAO,GAAE,aAAkB;IAKjC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAoCd,YAAY;IAyCpB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC;IAsH1D,eAAe,IAAI,IAAI;IAIvB,OAAO,CAAC,eAAe;YAYT,YAAY;IA0B1B,OAAO,CAAC,WAAW;IA8EnB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,eAAe;IAevB,OAAO,CAAC,cAAc;IA8BtB,SAAS,IAAI,OAAO;IAIpB,MAAM,IAAI,MAAM;IAIV,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAyBjC"}
+{"version":3,"file":"prolog.d.ts","sourceRoot":"","sources":["../src/prolog.ts"],"names":[],"mappings":"AAuDA,wBAAgB,eAAe,IAAI,MAAM,CAsCxC;AACD,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,YAAY,CAAM;IAC1B,OAAO,CAAC,WAAW,CAAM;IACzB,OAAO,CAAC,KAAK,CAAuC;IACpD,OAAO,CAAC,oBAAoB,CAAoC;IAChE,OAAO,CAAC,cAAc,CACyC;IAC/D,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,aAAa,CAA6B;gBAEtC,OAAO,GAAE,aAAkB;IAKjC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAoCd,YAAY;IAyCpB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC;IAuJ1D,eAAe,IAAI,IAAI;IAIvB,OAAO,CAAC,eAAe;YAYT,YAAY;IA0B1B,OAAO,CAAC,WAAW;IA8EnB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,eAAe;IAevB,OAAO,CAAC,cAAc;IA8BtB,SAAS,IAAI,OAAO;IAIpB,MAAM,IAAI,MAAM;IAIV,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAyBjC"}

package/dist/prolog.js

@@ -85,6 +85,7 @@ export class PrologProcess {
     outputBuffer = "";
     errorBuffer = "";
     cache = new Map();
+    interactiveQueryTail = Promise.resolve();
     useOneShotMode = typeof globalThis.Bun !== "undefined";
     attachedKbPath = null;
     onProcessExit = null;
@@ -174,78 +175,101 @@ export class PrologProcess {
         if (!this.process || !this.process.stdin) {
             throw new Error("Prolog process not started");
         }
-        this.outputBuffer = "";
-        this.errorBuffer = "";
-        this.process.stdin.write(`${goal}.
-`);
-        const debug = !!process.env.KIBI_PROLOG_DEBUG;
-        const normalizedGoal = isSingleGoal
-            ? this.normalizeGoal(goal)
-            : undefined;
-        const start = Date.now();
-        if (debug && normalizedGoal)
-            console.error(`[prolog debug] start query: ${normalizedGoal}`);
-        return new Promise((resolve, reject) => {
-            const timeoutId = setTimeout(() => {
-                const msg = `Query timeout after ${this.timeout / 1000}s`;
-                if (debug) {
-                    const tailOut = this.outputBuffer.slice(-2048);
-                    const tailErr = this.errorBuffer.slice(-2048);
-                    console.error(`[prolog debug] timeout: ${msg}`);
-                    console.error(`[prolog debug] last stdout: ---\n${tailOut}\n---`);
-                    console.error(`[prolog debug] last stderr: ---\n${tailErr}\n---`);
-                }
-                reject(new Error(msg));
-            }, this.timeout);
-            const checkResult = () => {
-                if (this.errorBuffer.length > 0 && this.errorBuffer.includes("ERROR")) {
-                    clearTimeout(timeoutId);
-                    if (debug && normalizedGoal)
-                        console.error(`[prolog debug] query error: ${normalizedGoal} error=${this.errorBuffer.split("\n")[0]}`);
-                    resolve({
-                        success: false,
-                        bindings: {},
-                        error: this.translateError(this.errorBuffer),
-                    });
-                }
-                else if (this.outputBuffer.includes("true.") ||
-                    this.outputBuffer.match(/^[A-Z_][A-Za-z0-9_]*\s*=\s*.+\./m) ||
-                    // Match multi-line output ending with ] (Prolog list/term output without trailing period)
-                    this.outputBuffer.match(/\]\s*$/m)) {
-                    clearTimeout(timeoutId);
-                    const result = {
-                        success: true,
-                        bindings: this.extractBindings(this.outputBuffer),
-                    };
-                    if (cacheable) {
-                        this.cache.set(goalKey, result);
+        const runInteractiveQuery = async () => {
+            this.outputBuffer = "";
+            this.errorBuffer = "";
+            const debug = !!process.env.KIBI_PROLOG_DEBUG;
+            const normalizedGoal = this.normalizeGoal(goal);
+            const wrappedGoal = /^once\s*\(/.test(normalizedGoal)
+                ? normalizedGoal
+                : `once((${normalizedGoal}))`;
+            const start = Date.now();
+            if (debug) {
+                console.error(`[prolog debug] start query: ${normalizedGoal}`);
+            }
+            this.process?.stdin?.write(`${wrappedGoal}.\n`);
+            return new Promise((resolve, reject) => {
+                const timeoutId = setTimeout(() => {
+                    const msg = `Query timeout after ${this.timeout / 1000}s (pid=${this.process?.pid ?? 0}, killed=${this.process?.killed ? "yes" : "no"}, exitCode=${this.process?.exitCode ?? "null"}, goal=${JSON.stringify(normalizedGoal.slice(0, 120))})`;
+                    if (debug) {
+                        const tailOut = this.outputBuffer.slice(-2048);
+                        const tailErr = this.errorBuffer.slice(-2048);
+                        console.error(`[prolog debug] timeout: ${msg}`);
+                        console.error(`[prolog debug] last stdout: ---\n${tailOut}\n---`);
+                        console.error(`[prolog debug] last stderr: ---\n${tailErr}\n---`);
+                    }
+                    reject(new Error(msg));
+                }, this.timeout);
+                const checkResult = () => {
+                    if (this.errorBuffer.length > 0 &&
+                        this.errorBuffer.includes("ERROR")) {
+                        clearTimeout(timeoutId);
+                        if (debug) {
+                            console.error(`[prolog debug] query error: ${normalizedGoal} error=${this.errorBuffer.split("\n")[0]}`);
+                        }
+                        resolve({
+                            success: false,
+                            bindings: {},
+                            error: this.translateError(this.errorBuffer),
+                        });
+                        return;
                     }
-                    if (debug && normalizedGoal) {
-                        console.error(`[prolog debug] query success: ${normalizedGoal} elapsed=${(Date.now() - start) / 1000}s`);
+                    if (this.outputBuffer.includes("true.") ||
+                        this.outputBuffer.match(/^[A-Z_][A-Za-z0-9_]*\s*=\s*.+\./m) ||
+                        this.outputBuffer.match(/\]\s*$/m)) {
+                        clearTimeout(timeoutId);
+                        const result = {
+                            success: true,
+                            bindings: this.extractBindings(this.outputBuffer),
+                        };
+                        // Treat any batch/compound goal as non-cacheable to preserve
+                        // read-after-write consistency. A batch goal is produced when
+                        // query(string[]) rewrites its inputs into "(goal1, goal2, ...)"
+                        // which isCacheableGoal() would otherwise mis-classify as cacheable.
+                        const isBatchGoal = /^\s*\(/.test(normalizedGoal);
+                        const shouldCache = cacheable && !isBatchGoal;
+                        if (!shouldCache) {
+                            this.invalidateCache();
+                        }
+                        if (shouldCache) {
+                            this.cache.set(goalKey, result);
+                        }
+                        if (debug) {
+                            console.error(`[prolog debug] query success: ${normalizedGoal} elapsed=${(Date.now() - start) / 1000}s`);
+                        }
+                        resolve(result);
+                        return;
                     }
-                    resolve(result);
-                    // Send newline to exit Prolog's interactive prompt
-                    if (this.process?.stdin) {
-                        this.process.stdin.write("\n");
+                    if (this.outputBuffer.includes("false.") ||
+                        this.outputBuffer.includes("fail.")) {
+                        clearTimeout(timeoutId);
+                        if (debug) {
+                            console.error(`[prolog debug] query failed (false): ${normalizedGoal}`);
+                        }
+                        resolve({
+                            success: false,
+                            bindings: {},
+                            error: "Query failed",
+                        });
+                        return;
                     }
-                }
-                else if (this.outputBuffer.includes("false.") ||
-                    this.outputBuffer.includes("fail.")) {
-                    clearTimeout(timeoutId);
-                    if (debug && normalizedGoal)
-                        console.error(`[prolog debug] query failed (false): ${normalizedGoal}`);
-                    resolve({
-                        success: false,
-                        bindings: {},
-                        error: "Query failed",
-                    });
-                }
-                else {
                     setTimeout(checkResult, 50);
-                }
-            };
-            checkResult();
+                };
+                checkResult();
+            });
+        };
+        const previousQuery = this.interactiveQueryTail;
+        let releaseQuery;
+        this.interactiveQueryTail = new Promise((resolve) => {
+            releaseQuery = resolve;
         });
+        await previousQuery;
+        try {
+            return await runInteractiveQuery();
+        }
+        finally {
+            releaseQuery();
+        }
     }
     invalidateCache() {
         this.cache.clear();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kibi-cli",
-  "version": "0.2.0",
+  "version": "0.2.3",
   "type": "module",
   "description": "Kibi CLI for knowledge base management",
   "engines": {
@@ -11,7 +11,13 @@
   "bin": {
     "kibi": "bin/kibi"
   },
-  "files": ["dist", "bin", "schema", "src/schemas", "src/public"],
+  "files": [
+    "dist",
+    "bin",
+    "schema",
+    "src/schemas",
+    "src/public"
+  ],
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "prepack": "npm run build"
@@ -58,7 +64,7 @@
     "fast-glob": "^3.2.12",
     "gray-matter": "^4.0.3",
     "js-yaml": "^4.1.0",
-    "kibi-core": "^0.1.6",
+    "kibi-core": "^0.1.7",
     "ts-morph": "^23.0.0"
   },
   "license": "AGPL-3.0-or-later",