sandstream-kit 1.1.0 → 1.2.0

package/dist/check-web-search.js

@@ -113,12 +113,43 @@ export async function checkWebSearch(config) {
                 };
             }
         case "google":
-            return {
-                provider,
-                configured: true,
-                healthy: true,
-                error: "Google Search not yet implemented in kit",
-            };
+            if (!config.apiKey || !config.cx) {
+                return {
+                    provider,
+                    configured: false,
+                    healthy: false,
+                    error: "Google Custom Search needs web.search.apiKey + web.search.cx (Programmable Search engine id)",
+                };
+            }
+            try {
+                // Custom Search JSON API — key + cx are query params by design.
+                const response = await fetchWithTimeout(`https://www.googleapis.com/customsearch/v1?key=${encodeURIComponent(config.apiKey)}&cx=${encodeURIComponent(config.cx)}&q=test&num=1`);
+                if (response.ok) {
+                    return { provider, configured: true, healthy: true };
+                }
+                if (response.status === 400 || response.status === 401 || response.status === 403) {
+                    return {
+                        provider,
+                        configured: true,
+                        healthy: false,
+                        error: "Invalid Google API key or cx (request rejected)",
+                    };
+                }
+                return {
+                    provider,
+                    configured: true,
+                    healthy: false,
+                    error: `API returned status ${response.status}`,
+                };
+            }
+            catch (err) {
+                return {
+                    provider,
+                    configured: true,
+                    healthy: false,
+                    error: err instanceof Error ? err.message : "API check failed",
+                };
+            }
         case "custom":
             if (!url) {
                 return {

package/dist/check-web-search.js.map

@@ -1 +1 @@
-{"version":3,"file":"check-web-search.js","sourceRoot":"","sources":["../src/check-web-search.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"check-web-search.js","sourceRoot":"","sources":["../src/check-web-search.ts"],"names":[],"mappings":"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"}

package/dist/cli.js

@@ -56,6 +56,7 @@ import { cmdFix } from "./fix.js";
 import { promptConfirm } from "./utils/prompt.js";
 import { startMcpServer } from "./mcp-server.js";
 import { c } from "./utils/colors.js";
+import { gatherStatus } from "./status.js";
 import { runDoctor } from "./doctor.js";
 import { inspectEnv } from "./env-inspect.js";
 import { detectStack } from "./stack-detector.js";
@@ -69,12 +70,13 @@ import { gatherProjectContext } from "./context.js";
 import { runTriage, listTriageTools } from "./triage.js";
 import { parsePkgSpec, installPkg } from "./pkg.js";
 import { openMemoryDb, getStats, getMemoryDbPath, searchMessages } from "./memory/db.js";
-import { indexClaudeTranscripts, getClaudeProjectsDir } from "./memory/parser.js";
+import { indexAllHarnesses } from "./memory/parser.js";
+import { mergeDb } from "./memory/merge.js";
 import { getCurrentProjectRoot } from "./memory/project.js";
 import { scanDbForSecrets } from "./memory/scan.js";
 import { backupEncrypted, restoreEncrypted } from "./memory/backup.js";
 import { shareEntry, listAreas, queryArea, getSharedPath, } from "./memory/shared.js";
-import { userPromptSubmitReminder, runSessionEndIndex } from "./memory/hook.js";
+import { userPromptSubmitReminder, runSessionEndIndex, sessionStartRecovery } from "./memory/hook.js";
 import { installMemoryHooks, uninstallMemoryHooks, getClaudeSettingsPath, } from "./memory/install.js";
 import { palAdd, palList, palDone, palSnooze, palAutoVerify, importLegacyLedger, } from "./memory/pal.js";
 import { saveThread, listThreads, removeThread, latestSessionId, resolveThread, } from "./memory/threads.js";
@@ -3329,6 +3331,21 @@ async function cmdContext() {
         return false;
     }
 }
+async function cmdStatus() {
+    const items = await gatherStatus();
+    if (hasFlag(process.argv, "--json")) {
+        console.log(JSON.stringify(items, null, 2));
+        return true;
+    }
+    const done = items.filter((i) => i.ok).length;
+    console.log(`${c.bold}kit status${c.reset}  ${c.dim}${done}/${items.length} set up${c.reset}`);
+    for (const item of items) {
+        const mark = item.ok ? `${c.green}✓${c.reset}` : `${c.yellow}○${c.reset}`;
+        const hint = !item.ok && item.hint ? `  ${c.dim}→ ${item.hint}${c.reset}` : "";
+        console.log(`  ${mark} ${item.label}  ${c.dim}${item.detail}${c.reset}${hint}`);
+    }
+    return true;
+}
 async function cmdWhoami() {
     const jsonMode = hasFlag(process.argv, "--json");
     let config = {};
@@ -3400,12 +3417,14 @@ function cmdVersion() {
     return true;
 }
 const COMMAND_HELP = {
+    status: "Adoption checklist — what's set up across kit + the next step for each gap",
     check: "Check status of all tools, services, secrets, and lock files",
     memory: "Local conversation memory — index transcripts + show stats",
     "memory index": "Index ~/.claude transcripts into the SQLite memory store",
     "memory search": "Full-text search memory (current project; --global for all)",
     "memory stats": "Show what the local memory store contains",
-    "memory install": "Wire UserPromptSubmit + SessionEnd hooks into ~/.claude/settings.json",
+    "memory merge": "Merge another machine's memory.db into this one (dedup by uuid)",
+    "memory install": "Wire UserPromptSubmit + SessionEnd + SessionStart (recovery) hooks into ~/.claude/settings.json",
     "memory scan": "Scan the memory store for stored secrets (exit 1 if any found)",
     "memory backup": "Encrypted backup of the memory store (AES-256-GCM; KIT_MEMORY_PASSPHRASE)",
     "memory restore": "Restore an encrypted memory backup (e.g. on a new machine)",
@@ -3896,6 +3915,7 @@ async function cmdMemory() {
         console.log("  kit memory index            Index ~/.claude transcripts into the memory store");
         console.log("  kit memory search <query>   Search memory (current project; --global for all)");
         console.log("  kit memory stats            Show what the memory store contains");
+        console.log("  kit memory merge <file>     Merge another machine's memory.db into this one");
         console.log("  kit memory install          Wire the 2 hooks into ~/.claude/settings.json");
         console.log("  kit memory uninstall        Remove the hooks");
         console.log("  kit memory pal [list|add|done|snooze|verify|import]   Pending action ledger");
@@ -3914,15 +3934,48 @@ async function cmdMemory() {
     if (subcommand === "index") {
         const db = openMemoryDb();
         const t0 = Date.now();
-        const res = indexClaudeTranscripts(db);
+        const byHarness = indexAllHarnesses(db);
         const ms = Date.now() - t0;
         db.close();
         if (jsonMode) {
-            console.log(JSON.stringify({ ...res, ms }));
+            console.log(JSON.stringify({ byHarness, ms }));
             return true;
         }
-        console.log(`${c.green}✓${c.reset} indexed ${c.bold}${res.messages}${c.reset} messages + ${res.toolUses} tool-uses from ${res.files} sessions ${c.dim}(${ms}ms)${c.reset}`);
-        console.log(`${c.dim}source: ${getClaudeProjectsDir()}${c.reset}`);
+        let messages = 0;
+        let toolUses = 0;
+        let files = 0;
+        let skipped = 0;
+        for (const r of Object.values(byHarness)) {
+            messages += r.messages;
+            toolUses += r.toolUses;
+            files += r.files;
+            skipped += r.filesSkipped;
+        }
+        console.log(`${c.green}✓${c.reset} indexed ${c.bold}${messages}${c.reset} messages + ${toolUses} tool-uses from ${files} sessions${skipped ? `, ${skipped} unchanged` : ""} ${c.dim}(${ms}ms)${c.reset}`);
+        for (const [harness, r] of Object.entries(byHarness)) {
+            if (r.files || r.messages) {
+                console.log(`  ${c.dim}${harness}: ${r.messages} msg · ${r.files} sessions${r.filesSkipped ? ` · ${r.filesSkipped} unchanged` : ""}${c.reset}`);
+            }
+        }
+        return true;
+    }
+    if (subcommand === "merge") {
+        const sourcePath = process.argv[4];
+        if (!sourcePath) {
+            console.error(`${c.red}usage: kit memory merge <other-machine-memory.db>${c.reset}`);
+            return false;
+        }
+        const db = openMemoryDb();
+        try {
+            const r = mergeDb(db, sourcePath);
+            console.log(`${c.green}✓${c.reset} merged ${c.bold}${r.messages}${c.reset} messages + ${r.toolUses} tool-uses · ${r.sessions} sessions · ${r.pending} pending · ${r.threads} copilots ${c.dim}from ${sourcePath}${c.reset}`);
+        }
+        catch (err) {
+            db.close();
+            console.error(`${c.red}${err.message}${c.reset}`);
+            return false;
+        }
+        db.close();
         return true;
     }
     if (subcommand === "stats") {
@@ -3984,6 +4037,12 @@ async function cmdMemory() {
             runSessionEndIndex();
             return true;
         }
+        if (event === "session-start") {
+            const text = sessionStartRecovery();
+            if (text)
+                console.log(text);
+            return true;
+        }
         console.error(`${c.red}Unknown hook event: ${event ?? "(none)"}${c.reset}`);
         return false;
     }
@@ -4379,6 +4438,9 @@ async function main() {
                 ok = true;
                 break;
             }
+            case "status":
+                ok = await cmdStatus();
+                break;
             case "whoami":
                 ok = await cmdWhoami();
                 break;