akm-cli 0.9.0-beta.1 → 0.9.0-beta.11

package/dist/scripts/migrate-storage.js

@@ -8882,12 +8882,14 @@ var init_improve_types = () => {};
 // src/core/state-db.ts
 var exports_state_db = {};
 __export(exports_state_db, {
+  withImmediateTransaction: () => withImmediateTransaction,
   upsertTaskHistory: () => upsertTaskHistory,
   upsertProposal: () => upsertProposal,
   upsertExtractedSession: () => upsertExtractedSession,
   shouldSkipAlreadyExtractedSession: () => shouldSkipAlreadyExtractedSession,
   runMigrations: () => runMigrations2,
   recordImproveRun: () => recordImproveRun,
+  recordFsProposalsImport: () => recordFsProposalsImport,
   readStateEvents: () => readStateEvents,
   queryTaskHistory: () => queryTaskHistory,
   queryImproveRuns: () => queryImproveRuns,
@@ -8898,9 +8900,12 @@ __export(exports_state_db, {
   proposalRowToProposal: () => proposalRowToProposal,
   openStateDatabase: () => openStateDatabase,
   listStateProposals: () => listStateProposals,
+  listStateProposalIdsByPrefix: () => listStateProposalIdsByPrefix,
   listExistingTableNames: () => listExistingTableNames,
+  insertProposalIfAbsent: () => insertProposalIfAbsent,
   insertEvent: () => insertEvent,
   importEventsJsonl: () => importEventsJsonl,
+  hasImportedFsProposals: () => hasImportedFsProposals,
   getTaskHistoryRuns: () => getTaskHistoryRuns,
   getTaskHistory: () => getTaskHistory,
   getStateProposal: () => getStateProposal,
@@ -8925,7 +8930,7 @@ function openStateDatabase(dbPath) {
   const db = openDatabase(resolvedPath);
   db.exec("PRAGMA journal_mode = WAL");
   db.exec("PRAGMA foreign_keys = ON");
-  db.exec("PRAGMA busy_timeout = 5000");
+  db.exec("PRAGMA busy_timeout = 30000");
   runMigrations2(db);
   return db;
 }
@@ -8972,7 +8977,11 @@ function proposalRowToProposal(row) {
       content: row.content,
       ...frontmatter !== undefined ? { frontmatter } : {}
     },
-    ...meta.review !== undefined ? { review: meta.review } : {}
+    ...meta.review !== undefined ? { review: meta.review } : {},
+    ...typeof meta.confidence === "number" ? { confidence: meta.confidence } : {},
+    ...meta.gateDecision !== undefined ? { gateDecision: meta.gateDecision } : {},
+    ...typeof meta.backupContent === "string" ? { backupContent: meta.backupContent } : {},
+    ...typeof meta.eligibilitySource === "string" ? { eligibilitySource: meta.eligibilitySource } : {}
   };
 }
 function proposalToRowValues(proposal, stashDir) {
@@ -8981,6 +8990,14 @@ function proposalToRowValues(proposal, stashDir) {
     metaObj.sourceRun = proposal.sourceRun;
   if (proposal.review !== undefined)
     metaObj.review = proposal.review;
+  if (proposal.confidence !== undefined)
+    metaObj.confidence = proposal.confidence;
+  if (proposal.gateDecision !== undefined)
+    metaObj.gateDecision = proposal.gateDecision;
+  if (proposal.backupContent !== undefined)
+    metaObj.backupContent = proposal.backupContent;
+  if (proposal.eligibilitySource !== undefined)
+    metaObj.eligibilitySource = proposal.eligibilitySource;
   return {
     id: proposal.id,
     stash_dir: stashDir,
@@ -9074,15 +9091,52 @@ function listStateProposals(db, options = {}) {
   const where = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
   const rows = db.prepare(`SELECT id, stash_dir, ref, status, source, created_at, updated_at,
               content, frontmatter_json, metadata_json
-       FROM proposals ${where} ORDER BY created_at ASC`).all(...params);
+       FROM proposals ${where} ORDER BY created_at ASC, rowid ASC`).all(...params);
   return rows.map(proposalRowToProposal);
 }
-function getStateProposal(db, id) {
-  const row = db.prepare(`SELECT id, stash_dir, ref, status, source, created_at, updated_at,
+function getStateProposal(db, id, stashDir) {
+  const sql = `SELECT id, stash_dir, ref, status, source, created_at, updated_at,
               content, frontmatter_json, metadata_json
-       FROM proposals WHERE id = ?`).get(id);
+       FROM proposals WHERE id = ?${stashDir ? " AND stash_dir = ?" : ""}`;
+  const row = stashDir ? db.prepare(sql).get(id, stashDir) : db.prepare(sql).get(id);
   return row ? proposalRowToProposal(row) : undefined;
 }
+function listStateProposalIdsByPrefix(db, stashDir, idPrefix) {
+  const escaped = idPrefix.replace(/[\\%_]/g, (ch) => `\\${ch}`);
+  const rows = db.prepare(`SELECT id FROM proposals
+       WHERE stash_dir = ? AND status = 'pending' AND id LIKE ? ESCAPE '\\'
+       ORDER BY id ASC`).all(stashDir, `${escaped}%`);
+  return rows.map((r) => r.id);
+}
+function hasImportedFsProposals(db, stashDir) {
+  return Boolean(db.prepare("SELECT 1 FROM proposal_fs_imports WHERE stash_dir = ?").get(stashDir));
+}
+function recordFsProposalsImport(db, stashDir, importedCount) {
+  db.prepare("INSERT OR REPLACE INTO proposal_fs_imports (stash_dir, imported_at, imported_count) VALUES (?, ?, ?)").run(stashDir, new Date().toISOString(), importedCount);
+}
+function insertProposalIfAbsent(db, proposal, stashDir) {
+  const v = proposalToRowValues(proposal, stashDir);
+  const result = db.prepare(`
+      INSERT OR IGNORE INTO proposals
+        (id, stash_dir, ref, status, source, created_at, updated_at, content, frontmatter_json, metadata_json)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `).run(v.id, v.stash_dir, v.ref, v.status, v.source, v.created_at, v.updated_at, v.content, v.frontmatter_json, v.metadata_json);
+  const changes = result.changes ?? 0;
+  return Number(changes) > 0;
+}
+function withImmediateTransaction(db, fn) {
+  db.exec("BEGIN IMMEDIATE");
+  try {
+    const result = fn();
+    db.exec("COMMIT");
+    return result;
+  } catch (err) {
+    try {
+      db.exec("ROLLBACK");
+    } catch {}
+    throw err;
+  }
+}
 function upsertTaskHistory(db, row) {
   db.prepare(`
     INSERT OR IGNORE INTO task_history
@@ -9363,7 +9417,9 @@ var init_state_db = __esm(() => {
       --
       -- Extensible (metadata_json) columns:
       --   metadata_json TEXT      \u2014 JSON object for future proposal fields.
-      --                             Current fields stored here: sourceRun, review.
+      --                             Current fields stored here: sourceRun,
+      --                             review, confidence, gateDecision (#577),
+      --                             backupContent, eligibilitySource.
       --
       -- ADD COLUMN extension points (future migrations):
       --   ALTER TABLE proposals ADD COLUMN source_run TEXT DEFAULT NULL;
@@ -9550,6 +9606,23 @@ var init_state_db = __esm(() => {
       CREATE INDEX IF NOT EXISTS idx_extract_sessions_processed
         ON extract_sessions_seen(processed_at);
     `
+    },
+    {
+      id: "005-proposal-fs-imports",
+      up: `
+      CREATE TABLE IF NOT EXISTS proposal_fs_imports (
+        stash_dir      TEXT    PRIMARY KEY,
+        imported_at    TEXT    NOT NULL,
+        imported_count INTEGER NOT NULL DEFAULT 0
+      );
+    `
+    },
+    {
+      id: "006-proposals-pending-ref-source",
+      up: `
+      CREATE INDEX IF NOT EXISTS idx_proposals_stash_status_ref_source
+        ON proposals(stash_dir, status, ref, source);
+    `
     }
   ];
 });
@@ -10238,6 +10311,9 @@ var init_inline_refs = __esm(() => {
 import fs9 from "fs";
 import os from "os";
 import path8 from "path";
+function claudeProjectsDir() {
+  return process.env.AKM_CLAUDE_PROJECTS_DIR ?? path8.join(os.homedir(), ".claude", "projects");
+}
 function parseClaudeEvent(entry, sessionId, filePath, fallbackTsMs) {
   if (!entry || typeof entry !== "object")
     return;
@@ -10294,11 +10370,11 @@ function parseClaudeEvent(entry, sessionId, filePath, fallbackTsMs) {
 class ClaudeCodeProvider {
   name = "claude-code";
   isAvailable() {
-    return fs9.existsSync(CLAUDE_PROJECTS_DIR);
+    return fs9.existsSync(claudeProjectsDir());
   }
   *readEvents(input) {
     try {
-      for (const jsonlPath of this.#walkJsonl(CLAUDE_PROJECTS_DIR)) {
+      for (const jsonlPath of this.#walkJsonl(claudeProjectsDir())) {
         const stat = fs9.statSync(jsonlPath);
         if (stat.mtimeMs < input.sinceMs)
           continue;
@@ -10326,7 +10402,7 @@ class ClaudeCodeProvider {
     }
   }
   listSessions(input = {}) {
-    const root = input.location ?? CLAUDE_PROJECTS_DIR;
+    const root = input.location ?? claudeProjectsDir();
     const sinceMs = input.sinceMs ?? 0;
     const summaries = [];
     try {
@@ -10460,16 +10536,14 @@ class ClaudeCodeProvider {
         const full = path8.join(dir, entry.name);
         if (entry.isDirectory())
           yield* this.#walkJsonl(full);
-        else if (entry.name.endsWith(".jsonl"))
+        else if (entry.name.endsWith(".jsonl") && entry.name !== "journal.jsonl")
           yield full;
       }
     } catch {}
   }
 }
-var CLAUDE_PROJECTS_DIR;
 var init_session_log = __esm(() => {
   init_inline_refs();
-  CLAUDE_PROJECTS_DIR = path8.join(os.homedir(), ".claude", "projects");
 });
 
 // src/integrations/harnesses/claude/index.ts
@@ -15458,8 +15532,18 @@ var init_config_schema = __esm(() => {
     contradictionDetection: exports_external.object({ enabled: exports_external.boolean().optional() }).strict().optional(),
     defaultSince: exports_external.string().min(1).optional(),
     maxTotalChars: positiveInt.optional(),
+    minContentChars: exports_external.number().int().min(0).optional(),
     maxChunkSize: exports_external.number().int().min(1).max(50).optional(),
+    incrementalSince: exports_external.string().optional(),
+    limit: positiveInt.optional(),
+    neighborsPerChanged: exports_external.number().int().min(1).optional(),
+    requirePlannedRefs: exports_external.boolean().optional(),
+    dueDays: exports_external.number().int().min(0).optional(),
+    maxPerRun: positiveInt.optional(),
+    importanceWeights: exports_external.record(exports_external.string().min(1), exports_external.number()).optional(),
+    minPendingCount: exports_external.number().int().min(0).optional(),
     minNewSessions: exports_external.number().int().min(0).optional(),
+    maxSessionsPerRun: exports_external.number().int().min(0).optional(),
     indexSessions: exports_external.boolean().optional(),
     minSessionDuration: exports_external.number().min(0).optional(),
     applyMode: exports_external.enum(["queue", "promote"]).optional(),
@@ -15480,7 +15564,8 @@ var init_config_schema = __esm(() => {
     memoryInference: ImproveProcessConfigSchema.optional(),
     graphExtraction: ImproveProcessConfigSchema.optional(),
     validation: ImproveProcessConfigSchema.optional(),
-    triage: ImproveProcessConfigSchema.optional()
+    triage: ImproveProcessConfigSchema.optional(),
+    proactiveMaintenance: ImproveProcessConfigSchema.optional()
   }).passthrough().superRefine((val, ctx) => {
     const raw = val;
     if ("feedbackDistillation" in raw) {
@@ -15498,7 +15583,8 @@ var init_config_schema = __esm(() => {
       "graphExtraction",
       "validation",
       "extract",
-      "triage"
+      "triage",
+      "proactiveMaintenance"
     ]);
     for (const k of Object.keys(raw)) {
       if (!allowed.has(k)) {
@@ -16237,6 +16323,7 @@ __export(exports_db, {
   getMeta: () => getMeta,
   getLlmCacheEntry: () => getLlmCacheEntry,
   getLlmCacheEntriesByRefs: () => getLlmCacheEntriesByRefs,
+  getIndexedFilePaths: () => getIndexedFilePaths,
   getIndexDirState: () => getIndexDirState,
   getEntryRefRowsForStashRoot: () => getEntryRefRowsForStashRoot,
   getEntryIdByFilePath: () => getEntryIdByFilePath,
@@ -16280,7 +16367,7 @@ function openDatabase2(dbPath, options) {
   }
   const db = openDatabase(resolvedPath);
   db.exec("PRAGMA journal_mode = WAL");
-  db.exec("PRAGMA busy_timeout = 5000");
+  db.exec("PRAGMA busy_timeout = 30000");
   db.exec("PRAGMA foreign_keys = ON");
   loadVecExtension(db);
   const resolvedDim = options?.embeddingDim ?? resolveConfiguredEmbeddingDim();
@@ -16304,7 +16391,7 @@ function openExistingDatabase(dbPath) {
   const resolvedPath = dbPath ?? getDbPath();
   const db = openDatabase(resolvedPath);
   db.exec("PRAGMA journal_mode = WAL");
-  db.exec("PRAGMA busy_timeout = 5000");
+  db.exec("PRAGMA busy_timeout = 30000");
   db.exec("PRAGMA foreign_keys = ON");
   loadVecExtension(db);
   return db;
@@ -17136,6 +17223,10 @@ function getEntryIdByFilePath(db, filePath) {
   const row = db.prepare("SELECT id FROM entries WHERE file_path = ? LIMIT 1").get(filePath);
   return row?.id;
 }
+function getIndexedFilePaths(db) {
+  const rows = db.prepare("SELECT DISTINCT file_path FROM entries WHERE file_path IS NOT NULL AND file_path <> ''").all();
+  return new Set(rows.map((r) => r.file_path));
+}
 function getEntryFilePathById(db, id) {
   const row = db.prepare("SELECT file_path FROM entries WHERE id = ?").get(id);
   return row?.file_path;
@@ -17263,18 +17354,56 @@ function clearStaleCacheEntries(db) {
 function computeBodyHash(body) {
   return sha256Hex(body);
 }
+function bareRef(ref) {
+  try {
+    const parsed = parseAssetRef(ref);
+    return `${parsed.type}:${parsed.name}`;
+  } catch {
+    return ref;
+  }
+}
 function getRetrievalCounts(db, refs) {
   if (refs.length === 0)
     return new Map;
-  const result = new Map;
-  for (let i = 0;i < refs.length; i += SQLITE_CHUNK_SIZE) {
-    const chunk = refs.slice(i, i + SQLITE_CHUNK_SIZE);
+  const bareToInputs = new Map;
+  for (const ref of refs) {
+    const bare = bareRef(ref);
+    const existing = bareToInputs.get(bare);
+    if (existing)
+      existing.push(ref);
+    else
+      bareToInputs.set(bare, [ref]);
+  }
+  const bareForms = [...bareToInputs.keys()];
+  const countsByBare = new Map;
+  for (let i = 0;i < bareForms.length; i += SQLITE_CHUNK_SIZE) {
+    const chunk = bareForms.slice(i, i + SQLITE_CHUNK_SIZE);
     const placeholders = chunk.map(() => "?").join(", ");
-    const rows = db.prepare(`SELECT entry_ref, COUNT(*) AS cnt FROM usage_events
-         WHERE event_type IN ('search','show') AND entry_ref IN (${placeholders})
-         GROUP BY entry_ref`).all(...chunk);
-    for (const r of rows)
-      result.set(r.entry_ref, r.cnt);
+    const rows = db.prepare(`SELECT
+           CASE
+             WHEN instr(entry_ref, '//') > 0
+               THEN substr(entry_ref, instr(entry_ref, '//') + 2)
+             ELSE entry_ref
+           END AS bare_ref,
+           COUNT(*) AS cnt
+         FROM usage_events
+         WHERE event_type IN ('search','show','curate')
+           AND entry_ref IS NOT NULL
+           AND CASE
+                 WHEN instr(entry_ref, '//') > 0
+                   THEN substr(entry_ref, instr(entry_ref, '//') + 2)
+                 ELSE entry_ref
+               END IN (${placeholders})
+         GROUP BY bare_ref`).all(...chunk);
+    for (const r of rows) {
+      countsByBare.set(r.bare_ref, (countsByBare.get(r.bare_ref) ?? 0) + r.cnt);
+    }
+  }
+  const result = new Map;
+  for (const [bare, count] of countsByBare) {
+    for (const input of bareToInputs.get(bare) ?? []) {
+      result.set(input, count);
+    }
   }
   return result;
 }

package/dist/scripts/migrations/import-fs-improve-runs-to-db.js

@@ -8631,7 +8631,7 @@ function openStateDatabase(dbPath) {
   const db = openDatabase(resolvedPath);
   db.exec("PRAGMA journal_mode = WAL");
   db.exec("PRAGMA foreign_keys = ON");
-  db.exec("PRAGMA busy_timeout = 5000");
+  db.exec("PRAGMA busy_timeout = 30000");
   runMigrations2(db);
   return db;
 }
@@ -8706,7 +8706,9 @@ var MIGRATIONS = [
       --
       -- Extensible (metadata_json) columns:
       --   metadata_json TEXT      \u2014 JSON object for future proposal fields.
-      --                             Current fields stored here: sourceRun, review.
+      --                             Current fields stored here: sourceRun,
+      --                             review, confidence, gateDecision (#577),
+      --                             backupContent, eligibilitySource.
       --
       -- ADD COLUMN extension points (future migrations):
       --   ALTER TABLE proposals ADD COLUMN source_run TEXT DEFAULT NULL;
@@ -8893,6 +8895,23 @@ var MIGRATIONS = [
       CREATE INDEX IF NOT EXISTS idx_extract_sessions_processed
         ON extract_sessions_seen(processed_at);
     `
+  },
+  {
+    id: "005-proposal-fs-imports",
+    up: `
+      CREATE TABLE IF NOT EXISTS proposal_fs_imports (
+        stash_dir      TEXT    PRIMARY KEY,
+        imported_at    TEXT    NOT NULL,
+        imported_count INTEGER NOT NULL DEFAULT 0
+      );
+    `
+  },
+  {
+    id: "006-proposals-pending-ref-source",
+    up: `
+      CREATE INDEX IF NOT EXISTS idx_proposals_stash_status_ref_source
+        ON proposals(stash_dir, status, ref, source);
+    `
   }
 ];
 function runMigrations2(db) {

package/dist/sources/providers/tar-utils.js

@@ -12,12 +12,12 @@
  * providers that fetch tarballs (currently `NpmSourceProvider` and the
  * registry index builder).
  */
-import { spawnSync } from "node:child_process";
 import { createHash } from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
 import { isWithin } from "../../core/common.js";
 import { warn } from "../../core/warn.js";
+import { spawnSync } from "../../runtime.js";
 /**
  * Verify an archive's integrity against a known hash. Throws and removes
  * the archive when verification fails.
@@ -65,17 +65,25 @@ export function verifyArchiveIntegrity(archivePath, expected, source) {
  * tree for symlinks that would escape the destination.
  */
 export function extractTarGzSecure(archivePath, destinationDir) {
-    const listResult = spawnSync("tar", ["tzf", archivePath], { encoding: "utf8" });
-    if (listResult.status !== 0) {
-        const err = listResult.stderr?.trim() || listResult.error?.message || "unknown error";
+    const listResult = spawnSync(["tar", "tzf", archivePath]);
+    if (!listResult.success) {
+        const err = listResult.stderr?.toString().trim() || "unknown error";
         throw new Error(`Failed to inspect archive ${archivePath}: ${err}`);
     }
-    validateTarEntries(listResult.stdout);
+    validateTarEntries(listResult.stdout.toString());
     fs.rmSync(destinationDir, { recursive: true, force: true });
     fs.mkdirSync(destinationDir, { recursive: true });
-    const extractResult = spawnSync("tar", ["xzf", archivePath, "--no-same-owner", "--strip-components=1", "-C", destinationDir], { encoding: "utf8" });
-    if (extractResult.status !== 0) {
-        const err = extractResult.stderr?.trim() || extractResult.error?.message || "unknown error";
+    const extractResult = spawnSync([
+        "tar",
+        "xzf",
+        archivePath,
+        "--no-same-owner",
+        "--strip-components=1",
+        "-C",
+        destinationDir,
+    ]);
+    if (!extractResult.success) {
+        const err = extractResult.stderr?.toString().trim() || "unknown error";
         throw new Error(`Failed to extract archive ${archivePath}: ${err}`);
     }
     // Post-extraction scan: verify all extracted files are within destinationDir

package/dist/tasks/backends/cron.js

@@ -64,13 +64,11 @@ export function CRON_BACKEND(options = {}) {
         },
         list() {
             const existing = readCrontab(exec);
-            const ids = [];
-            for (const line of existing.split(/\r?\n/)) {
-                const m = line.match(BLOCK_RE);
-                if (m)
-                    ids.push(m[1]);
-            }
-            return ids.map((id) => ({ id }));
+            return listBlocks(existing).map(({ id, body }) => ({ id, signature: normalizeSignature(body) }));
+        },
+        expectedSignature(task) {
+            const cronLine = buildCronLine(task, akmArgv, logDir);
+            return normalizeSignature(cronBlockBody(cronLine, task.enabled));
         },
     };
 }
@@ -82,9 +80,48 @@ export function buildCronLine(task, akmArgv, logDir) {
     const cmd = [...akmArgv, "tasks", "run", task.id].map((part) => quoteForCron(part)).join(" ");
     return `${cronExpr} ${cmd} >> ${quoteForCron(logPath)} 2>&1`;
 }
+/** The crontab line as it appears inside a block — commented when disabled. */
+export function cronBlockBody(cronLine, enabled) {
+    return enabled ? cronLine : `${DISABLED_PREFIX}${cronLine}`;
+}
 export function renderBlock(id, cronLine, enabled) {
-    const body = enabled ? cronLine : `${DISABLED_PREFIX}${cronLine}`;
-    return [BEGIN(id), body, END(id)].join("\n");
+    return [BEGIN(id), cronBlockBody(cronLine, enabled), END(id)].join("\n");
+}
+/**
+ * Parse the akm-owned blocks out of a crontab, returning each task id with the
+ * raw body line(s) between its BEGIN/END markers. Used by `list()` to build a
+ * drift signature, and exported for tests.
+ */
+export function listBlocks(existing) {
+    const out = [];
+    const lines = existing.split(/\r?\n/);
+    let currentId = null;
+    let body = [];
+    for (const line of lines) {
+        const begin = line.match(BLOCK_RE);
+        if (begin) {
+            currentId = begin[1];
+            body = [];
+            continue;
+        }
+        if (currentId !== null && line === END(currentId)) {
+            out.push({ id: currentId, body: body.join("\n") });
+            currentId = null;
+            body = [];
+            continue;
+        }
+        if (currentId !== null)
+            body.push(line);
+    }
+    return out;
+}
+/** Collapse incidental whitespace so signature comparison ignores it. */
+function normalizeSignature(body) {
+    return body
+        .split(/\r?\n/)
+        .map((l) => l.trim())
+        .filter((l) => l.length > 0)
+        .join("\n");
 }
 export function upsertBlock(existing, id, block) {
     const trimmed = existing.replace(/\s+$/g, "");