kibi-cli 0.2.6 → 0.2.7

package/dist/commands/check.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../src/commands/check.ts"],"names":[],"mappings":"AA2CA,MAAM,WAAW,YAAY;IAC3B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAuPvE"}
+{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../src/commands/check.ts"],"names":[],"mappings":"AA2CA,MAAM,WAAW,YAAY;IAC3B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAGD,wBAAsB,YAAY,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA0QvE"}

package/dist/commands/check.js

@@ -27,7 +27,10 @@ import { loadConfig } from "../utils/config.js";
 import { RULES, getEffectiveRules, } from "../utils/rule-registry.js";
 import { runAggregatedChecks } from "./aggregated-checks.js";
 import { getCurrentBranch } from "./init-helpers.js";
+// implements REQ-006
 export async function checkCommand(options) {
+    let prolog = null;
+    let attached = false;
     try {
         // Resolve KB path with priority:
         // --kb-path > git branch --show-current > KIBI_BRANCH env > develop > main
@@ -139,7 +142,7 @@ export async function checkCommand(options) {
                 process.exit(1);
             }
         }
-        const prolog = new PrologProcess({ timeout: 120000 });
+        prolog = new PrologProcess({ timeout: 120000 });
         await prolog.start();
         const kbPathEscaped = escapeAtom(resolvedKbPath);
         const attachResult = await prolog.query(`kb_attach('${kbPathEscaped}')`);
@@ -148,6 +151,7 @@ export async function checkCommand(options) {
             console.error(`Error: Failed to attach KB: ${attachResult.error}`);
             process.exit(1);
         }
+        attached = true;
         const violations = [];
         // Load config to get rule enablement settings
         const config = loadConfig(process.cwd());
@@ -161,10 +165,17 @@ export async function checkCommand(options) {
         async function runCheck(name, fn, ...args) {
             if (!effectiveRules.has(name))
                 return;
+            if (!prolog) {
+                throw new Error("Prolog process not initialized");
+            }
             const res = await fn(prolog, ...args);
             if (res?.length)
                 violations.push(...res);
         }
+        if (!prolog) {
+            throw new Error("Prolog process not initialized");
+        }
+        const activeProlog = prolog;
         // Use aggregated checks (single Prolog call) when possible for better performance
         // This is significantly faster in Bun/Docker environments where one-shot mode
         // spawns a new Prolog process for each query
@@ -182,7 +193,7 @@ export async function checkCommand(options) {
         if (canUseAggregated) {
             // Fast path: single Prolog call returning all violations
             // Pass the requireAdr option for symbol-traceability
-            const aggregatedViolations = await runAggregatedChecks(prolog, effectiveRules, checksConfig.symbolTraceability?.requireAdr ?? false);
+            const aggregatedViolations = await runAggregatedChecks(activeProlog, effectiveRules, checksConfig.symbolTraceability?.requireAdr ?? false);
             violations.push(...aggregatedViolations);
         }
         else {
@@ -192,16 +203,14 @@ export async function checkCommand(options) {
             await runCheck("symbol-traceability", (p) => checkSymbolTraceability(p, checksConfig.symbolTraceability?.requireAdr ?? false));
             await runCheck("no-dangling-refs", checkNoDanglingRefs);
             await runCheck("no-cycles", checkNoCycles);
-            const allEntityIds = await getAllEntityIds(prolog);
+            const allEntityIds = await getAllEntityIds(activeProlog);
             if (effectiveRules.has("required-fields")) {
-                const requiredViolations = await checkRequiredFields(prolog, allEntityIds);
+                const requiredViolations = await checkRequiredFields(activeProlog, allEntityIds);
                 violations.push(...requiredViolations);
             }
             await runCheck("deprecated-adr-no-successor", checkDeprecatedAdrs);
             await runCheck("domain-contradictions", checkDomainContradictions);
         }
-        await prolog.query("kb_detach");
-        await prolog.terminate();
         if (violations.length === 0) {
             console.log("✓ No violations found. KB is valid.");
             process.exit(0);
@@ -224,6 +233,20 @@ export async function checkCommand(options) {
         console.error(`Error: ${message}`);
         process.exit(1);
     }
+    finally {
+        if (prolog) {
+            if (attached) {
+                try {
+                    await prolog.query("kb_detach");
+                }
+                catch { }
+            }
+            try {
+                await prolog.terminate();
+            }
+            catch { }
+        }
+    }
 }
 async function checkMustPriorityCoverage(prolog) {
     const violations = [];

package/dist/commands/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/commands/query.ts"],"names":[],"mappings":"AAmCA,UAAU,YAAY;IACpB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAsB,YAAY,CAChC,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,IAAI,CAAC,CAyKf"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/commands/query.ts"],"names":[],"mappings":"AA2CA,UAAU,YAAY;IACpB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAGD,wBAAsB,YAAY,CAChC,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,IAAI,CAAC,CAgLf"}

package/dist/commands/query.js

@@ -23,9 +23,12 @@ import relationshipSchema from "../public/schemas/relationship.js";
 import { VALID_ENTITY_TYPES } from "../query/service.js";
 import { resolveActiveBranch } from "../utils/branch-resolver.js";
 const REL_TYPES = relationshipSchema.properties.type.enum;
+// implements REQ-003
 export async function queryCommand(type, options) {
+    let prolog = null;
+    let attached = false;
     try {
-        const prolog = new PrologProcess({ timeout: 120000 });
+        prolog = new PrologProcess({ timeout: 120000 });
         await prolog.start();
         await prolog.query("set_prolog_flag(answer_write_options, [max_depth(0), spacing(next_argument)])");
         // Resolve branch: allow non-git repos to use default "main" for query
@@ -56,6 +59,7 @@ export async function queryCommand(type, options) {
             console.error(`Error: Failed to attach KB: ${attachResult.error || "Unknown error"}`);
             process.exit(1);
         }
+        attached = true;
         let results = [];
         // Query relationships mode
         if (options.relationships) {
@@ -85,10 +89,9 @@ export async function queryCommand(type, options) {
         else if (type || options.source) {
             // Validate type if provided
             if (type && !VALID_ENTITY_TYPES.includes(type)) {
-                await prolog.query("kb_detach");
-                await prolog.terminate();
                 console.error(`Error: Invalid type '${type}'. Valid types: ${VALID_ENTITY_TYPES.join(", ")}`);
-                process.exit(1);
+                process.exitCode = 1;
+                return;
             }
             let goal;
             if (options.source) {
@@ -134,13 +137,10 @@ export async function queryCommand(type, options) {
             }
         }
         else {
-            await prolog.query("kb_detach");
-            await prolog.terminate();
             console.error("Error: Must specify entity type, --source, or --relationships option");
-            process.exit(1);
+            process.exitCode = 1;
+            return;
         }
-        await prolog.query("kb_detach");
-        await prolog.terminate();
         // Apply pagination
         const limit = Number.parseInt(options.limit || "100");
         const offset = Number.parseInt(options.offset || "0");
@@ -152,7 +152,7 @@ export async function queryCommand(type, options) {
             else {
                 console.log("No entities found");
             }
-            process.exit(0);
+            return;
         }
         // Format output
         if (options.format === "table") {
@@ -161,12 +161,25 @@ export async function queryCommand(type, options) {
         else {
             console.log(JSON.stringify(paginated, null, 2));
         }
-        process.exit(0);
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
         console.error(`Error: ${message}`);
-        process.exit(1);
+        process.exitCode = 1;
+    }
+    finally {
+        if (prolog) {
+            if (attached) {
+                try {
+                    await prolog.query("kb_detach");
+                }
+                catch { }
+            }
+            try {
+                await prolog.terminate();
+            }
+            catch { }
+        }
     }
 }
 /**
@@ -183,10 +196,11 @@ function outputTable(items, isRelationships) {
             colWidths: [20, 18, 18],
         });
         for (const item of items) {
+            const rel = item;
             table.push([
-                item.type || "N/A",
-                item.from?.substring(0, 16) || "N/A",
-                item.to?.substring(0, 16) || "N/A",
+                rel.type || "N/A",
+                rel.from.substring(0, 16) || "N/A",
+                rel.to.substring(0, 16) || "N/A",
             ]);
         }
         console.log(table.toString());
@@ -197,12 +211,22 @@ function outputTable(items, isRelationships) {
             colWidths: [18, 10, 40, 12, 30],
         });
         for (const entity of items) {
+            const record = entity;
+            const id = typeof record.id === "string" ? record.id : "N/A";
+            const entityType = typeof record.type === "string" ? record.type : "N/A";
+            const title = typeof record.title === "string" ? record.title : "N/A";
+            const status = typeof record.status === "string" ? record.status : "N/A";
+            const tags = Array.isArray(record.tags)
+                ? record.tags
+                    .filter((tag) => typeof tag === "string")
+                    .join(", ")
+                : "";
             table.push([
-                entity.id?.substring(0, 16) || "N/A",
-                entity.type || "N/A",
-                (entity.title || "N/A").substring(0, 38),
-                entity.status || "N/A",
-                (entity.tags || []).join(", ").substring(0, 28) || "",
+                id.substring(0, 16),
+                entityType,
+                title.substring(0, 38),
+                status,
+                tags.substring(0, 28),
             ]);
         }
         console.log(table.toString());

package/dist/commands/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAyCjE,qBAAa,SAAU,SAAQ,KAAK;gBACtB,OAAO,EAAE,MAAM;CAI5B;AAED,wBAAsB,WAAW,CAC/B,OAAO,GAAE;IACP,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;CACd,GACL,OAAO,CAAC,WAAW,CAAC,CA4VtB;AAGD,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAyCjE,qBAAa,SAAU,SAAQ,KAAK;gBACtB,OAAO,EAAE,MAAM;CAI5B;AAGD,wBAAsB,WAAW,CAC/B,OAAO,GAAE;IACP,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;CACd,GACL,OAAO,CAAC,WAAW,CAAC,CA0WtB;AAGD,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC"}

package/dist/commands/sync.js

@@ -35,6 +35,7 @@ export class SyncError extends Error {
         this.name = "SyncError";
     }
 }
+// implements REQ-003, REQ-007
 export async function syncCommand(options = {}) {
     const validateOnly = options.validateOnly ?? false;
     const rebuild = options.rebuild ?? false;
@@ -106,9 +107,9 @@ export async function syncCommand(options = {}) {
                 const hash = hashFile(file);
                 const lastSeen = syncCache.seenAt[key];
                 const lastSeenMs = lastSeen ? Date.parse(lastSeen) : Number.NaN;
-                const expired = Number.isNaN(lastSeenMs)
-                    ? false
-                    : nowMs - lastSeenMs > SYNC_CACHE_TTL_MS;
+                const expired = !lastSeen ||
+                    Number.isNaN(lastSeenMs) ||
+                    nowMs - lastSeenMs > SYNC_CACHE_TTL_MS;
                 nextHashes[key] = hash;
                 nextSeenAt[key] = nowIso;
                 const isChanged = expired || syncCache.hashes[key] !== hash || validateOnly || rebuild;
@@ -126,6 +127,8 @@ export async function syncCommand(options = {}) {
                 console.warn(`Warning: Failed to hash ${file}: ${message}`);
             }
         }
+        const performedFullReindex = changedMarkdownFiles.length === markdownFiles.length &&
+            changedManifestFiles.length === manifestFiles.length;
         // Content extraction
         const { results, failedCacheKeys, errors } = await processExtractions(changedMarkdownFiles, changedManifestFiles, validateOnly);
         // Collect INVALID_AUTHORING diagnostics
@@ -176,7 +179,7 @@ export async function syncCommand(options = {}) {
                     continue;
                 }
                 evictedHashes[key] = hash;
-                evictedSeenAt[key] = nextHashes[key] ?? nowIso;
+                evictedSeenAt[key] = nextSeenAt[key] ?? nowIso;
             }
             writeSyncCache(cachePath, {
                 version: SYNC_CACHE_VERSION,
@@ -204,7 +207,13 @@ export async function syncCommand(options = {}) {
                 throw new SyncError(`Failed to attach to staging KB: ${attachResult.error || "Unknown error"}`);
             }
             const entityIds = new Set();
-            // Validate and filter dangling relationships
+            // Track entity counts by type
+            for (const { entity } of results) {
+                entityCounts[entity.type] = (entityCounts[entity.type] || 0) + 1;
+            }
+            // Persist entities
+            const { entityCount, kbModified: entitiesModified } = await persistEntities(prolog, results, entityIds);
+            // Validate and filter dangling relationships after entity IDs are known.
             const validationErrors = validateRelationships(allRelationships, entityIds);
             if (validationErrors.length > 0) {
                 console.warn(`Warning: ${validationErrors.length} dangling relationship(s) found`);
@@ -214,19 +223,16 @@ export async function syncCommand(options = {}) {
             }
             const danglingKeys = new Set(validationErrors.map(({ relationship: r }) => `${r.type}|${r.from}|${r.to}`));
             const validRelationships = allRelationships.filter((r) => !danglingKeys.has(`${r.type}|${r.from}|${r.to}`));
-            // Track entity counts by type
-            for (const { entity } of results) {
-                entityCounts[entity.type] = (entityCounts[entity.type] || 0) + 1;
-            }
-            // Persist entities
-            const { entityCount, kbModified: entitiesModified } = await persistEntities(prolog, results, entityIds);
             // Persist relationships
             const { relationshipCount, kbModified: relationshipsModified } = await persistRelationships(prolog, results, validRelationships);
             const kbModified = entitiesModified || relationshipsModified;
             if (kbModified) {
                 prolog.invalidateCache();
             }
-            await prolog.query("kb_save");
+            const saveResult = await prolog.query("kb_save");
+            if (!saveResult.success) {
+                throw new SyncError(`Failed to save staging KB: ${saveResult.error || "Unknown error"}`);
+            }
             await prolog.query("kb_detach");
             await prolog.terminate();
             // Publish staging to live
@@ -239,7 +245,7 @@ export async function syncCommand(options = {}) {
                     continue;
                 }
                 evictedHashes[key] = hash;
-                evictedSeenAt[key] = nextHashes[key] ?? nowIso;
+                evictedSeenAt[key] = nextSeenAt[key] ?? nowIso;
             }
             const liveCachePath = path.join(livePath, "sync-cache.json");
             writeSyncCache(liveCachePath, {
@@ -248,7 +254,9 @@ export async function syncCommand(options = {}) {
                 seenAt: evictedSeenAt,
             });
             published = true;
-            if (markdownFiles.length > 0 && entityCount < markdownFiles.length) {
+            if (performedFullReindex &&
+                markdownFiles.length > 0 &&
+                entityCount < markdownFiles.length) {
                 diagnostics.push(createDocsNotIndexedDiagnostic(markdownFiles.length, entityCount));
             }
             console.log(`✓ Imported ${entityCount} entities, ${relationshipCount} relationships`);

package/dist/prolog.d.ts

@@ -25,6 +25,8 @@ export declare class PrologProcess {
     query(goal: string | string[]): Promise<QueryResult>;
     invalidateCache(): void;
     private isCacheableGoal;
+    private isMutatingGoal;
+    private isExplicitSaveGoal;
     private queryOneShot;
     private execOneShot;
     private normalizeGoal;

package/dist/prolog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prolog.d.ts","sourceRoot":"","sources":["../src/prolog.ts"],"names":[],"mappings":"AA4BA,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"}
+{"version":3,"file":"prolog.d.ts","sourceRoot":"","sources":["../src/prolog.ts"],"names":[],"mappings":"AA4BA,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;IAavB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,kBAAkB;YAIZ,YAAY;IAkC1B,OAAO,CAAC,WAAW;IA8FnB,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

@@ -73,7 +73,7 @@ export class PrologProcess {
         const kbPath = resolveKbPlPath();
         this.process = spawn(this.swiplPath, [
             "-g",
-            `use_module('${kbPath}'), set_prolog_flag(answer_write_options, [max_depth(0), quoted(true)])`,
+            `use_module('${kbPath}'), use_module(library(semweb/rdf_db)), set_prolog_flag(answer_write_options, [max_depth(0), quoted(true)])`,
             "--quiet",
         ]);
         if (!this.process.stdout || !this.process.stderr || !this.process.stdin) {
@@ -256,6 +256,16 @@ export class PrologProcess {
             trimmed.startsWith("kb_delete_") ||
             trimmed.startsWith("kb_retract_"));
     }
+    // implements REQ-009
+    isMutatingGoal(goal) {
+        return (goal.includes("kb_assert_") ||
+            goal.includes("kb_delete_") ||
+            goal.includes("kb_retract_"));
+    }
+    // implements REQ-009
+    isExplicitSaveGoal(goal) {
+        return goal.trim().startsWith("kb_save");
+    }
     async queryOneShot(goal) {
         if (Array.isArray(goal)) {
             return this.execOneShot(goal, this.attachedKbPath);
@@ -269,6 +279,13 @@ export class PrologProcess {
         }
         const attachMatch = trimmedGoal.match(/^kb_attach\('(.+)'\)$/);
         if (attachMatch) {
+            if (this.attachedKbPath !== null) {
+                return {
+                    success: false,
+                    bindings: {},
+                    error: "KB already attached",
+                };
+            }
             const attachResult = this.execOneShot(trimmedGoal, null);
             if (attachResult.success) {
                 this.attachedKbPath = attachMatch[1];
@@ -278,11 +295,21 @@ export class PrologProcess {
         return this.execOneShot(trimmedGoal, this.attachedKbPath);
     }
     execOneShot(goal, kbPath) {
-        const goalList = Array.isArray(goal)
+        const originalGoalList = Array.isArray(goal)
             ? goal.map((item) => this.normalizeGoal(item))
             : [this.normalizeGoal(goal)];
+        const explicitSaveRequested = Array.isArray(goal)
+            ? originalGoalList.some((item) => this.isExplicitSaveGoal(item))
+            : false;
+        const goalList = explicitSaveRequested
+            ? originalGoalList.filter((item) => !this.isExplicitSaveGoal(item))
+            : originalGoalList;
         const isBatch = goalList.length > 1;
-        const combinedGoal = goalList.length === 1 ? goalList[0] : `(${goalList.join(", ")})`;
+        const combinedGoal = goalList.length === 0
+            ? "true"
+            : goalList.length === 1
+                ? goalList[0]
+                : `(${goalList.join(", ")})`;
         const kbModulePath = resolveKbPlPath();
         const prologGoal = [
             `use_module('${kbModulePath}')`,
@@ -292,8 +319,14 @@ export class PrologProcess {
             "read_term_from_atom(GoalAtom, Goal, [variable_names(Vars)])",
             kbPath ? "getenv('KIBI_KB_PATH', KBPath), kb_attach(KBPath)" : "true",
             isBatch ? "WrappedGoal = rdf_transaction(Goal)" : "WrappedGoal = Goal",
-            "(catch(call(WrappedGoal), E, (print_message(error, E), fail)) -> (forall(member(Name=Value, Vars), (write(Name), write('='), write_term(Value, [quoted(true), max_depth(0)]), writeln('.'))), writeln('__KIBI_TRUE__.')) ; writeln('__KIBI_FALSE__.'))",
-            kbPath ? "kb_save, kb_detach" : "true",
+            "(catch(call(WrappedGoal), E, (print_message(error, E), fail)) -> QuerySucceeded = true ; QuerySucceeded = false)",
+            kbPath &&
+                (explicitSaveRequested ||
+                    goalList.some((item) => this.isMutatingGoal(item)))
+                ? "(QuerySucceeded == true -> kb_save ; true)"
+                : "true",
+            kbPath ? "kb_detach" : "true",
+            "(QuerySucceeded == true -> (forall(member(Name=Value, Vars), (write(Name), write('='), write_term(Value, [quoted(true), max_depth(0)]), writeln('.'))), writeln('__KIBI_TRUE__.')) ; writeln('__KIBI_FALSE__.'))",
         ].join(", ");
         const result = spawnSync(this.swiplPath, ["-q", "-g", prologGoal, "-t", "halt"], {
             encoding: "utf8",
@@ -313,6 +346,13 @@ export class PrologProcess {
         }
         const stdout = result.stdout ?? "";
         const stderr = result.stderr ?? "";
+        if (stderr.includes("ERROR")) {
+            return {
+                success: false,
+                bindings: {},
+                error: this.translateError(stderr),
+            };
+        }
         if (stdout.includes("__KIBI_TRUE__")) {
             const clean = stdout
                 .split("\n")
@@ -323,13 +363,6 @@ export class PrologProcess {
                 bindings: this.extractBindings(clean),
             };
         }
-        if (stderr.includes("ERROR")) {
-            return {
-                success: false,
-                bindings: {},
-                error: this.translateError(stderr),
-            };
-        }
         return {
             success: false,
             bindings: {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kibi-cli",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "type": "module",
   "description": "Kibi CLI for knowledge base management",
   "engines": {