claudekit-cli 3.41.0-dev.1 → 3.41.0-dev.2

package/dist/index.js

@@ -57633,7 +57633,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "3.41.0-dev.1",
+    version: "3.41.0-dev.2",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {
@@ -68344,7 +68344,7 @@ var init_content_validator = __esm(() => {
 import { createHash as createHash6 } from "node:crypto";
 import { existsSync as existsSync66, mkdirSync as mkdirSync4, readFileSync as readFileSync15, readdirSync as readdirSync8, statSync as statSync10 } from "node:fs";
 import { rename as rename9, writeFile as writeFile35 } from "node:fs/promises";
-import { homedir as homedir34 } from "node:os";
+import { homedir as homedir33 } from "node:os";
 import { basename as basename19, join as join132 } from "node:path";
 function getCachedContext(repoPath) {
   const cachePath = getCacheFilePath(repoPath);
@@ -68419,7 +68419,7 @@ function getCacheFilePath(repoPath) {
 }
 var CACHE_DIR, CACHE_TTL_MS4;
 var init_context_cache_manager = __esm(() => {
-  CACHE_DIR = join132(homedir34(), ".claudekit", "cache");
+  CACHE_DIR = join132(homedir33(), ".claudekit", "cache");
   CACHE_TTL_MS4 = 24 * 60 * 60 * 1000;
 });
 
@@ -68873,10 +68873,10 @@ IMPORTANT: Generate the image and output the path as JSON: {"imagePath": "/path/
 // src/commands/content/phases/photo-generator.ts
 import { execSync as execSync7 } from "node:child_process";
 import { existsSync as existsSync68, mkdirSync as mkdirSync5, readdirSync as readdirSync10 } from "node:fs";
-import { homedir as homedir35 } from "node:os";
+import { homedir as homedir34 } from "node:os";
 import { join as join134 } from "node:path";
 async function generatePhoto(_content, context, config, platform14, contentId, contentLogger) {
-  const mediaDir = join134(config.contentDir.replace(/^~/, homedir35()), "media", String(contentId));
+  const mediaDir = join134(config.contentDir.replace(/^~/, homedir34()), "media", String(contentId));
   if (!existsSync68(mediaDir)) {
     mkdirSync5(mediaDir, { recursive: true });
   }
@@ -68990,7 +68990,7 @@ var init_content_creator = __esm(() => {
 
 // src/commands/content/phases/content-logger.ts
 import { createWriteStream as createWriteStream4, existsSync as existsSync69, mkdirSync as mkdirSync6, statSync as statSync11 } from "node:fs";
-import { homedir as homedir36 } from "node:os";
+import { homedir as homedir35 } from "node:os";
 import { join as join135 } from "node:path";
 
 class ContentLogger {
@@ -68999,7 +68999,7 @@ class ContentLogger {
   logDir;
   maxBytes;
   constructor(maxBytes = 0) {
-    this.logDir = join135(homedir36(), ".claudekit", "logs");
+    this.logDir = join135(homedir35(), ".claudekit", "logs");
     this.maxBytes = maxBytes;
   }
   init() {
@@ -70598,11 +70598,11 @@ var init_setup_wizard = __esm(() => {
 
 // src/commands/content/content-review-commands.ts
 import { existsSync as existsSync73 } from "node:fs";
-import { homedir as homedir37 } from "node:os";
+import { homedir as homedir36 } from "node:os";
 async function queueContent() {
   const cwd2 = process.cwd();
   const config = await loadContentConfig(cwd2);
-  const dbPath = config.dbPath.replace(/^~/, homedir37());
+  const dbPath = config.dbPath.replace(/^~/, homedir36());
   if (!existsSync73(dbPath)) {
     logger.info("No content database found. Run 'ck content setup' first.");
     return;
@@ -70629,7 +70629,7 @@ async function queueContent() {
 async function approveContentCmd(id) {
   const cwd2 = process.cwd();
   const config = await loadContentConfig(cwd2);
-  const dbPath = config.dbPath.replace(/^~/, homedir37());
+  const dbPath = config.dbPath.replace(/^~/, homedir36());
   const db = initDatabase(dbPath);
   try {
     approveContent(db, Number.parseInt(id, 10));
@@ -70641,7 +70641,7 @@ async function approveContentCmd(id) {
 async function rejectContentCmd(id, reason) {
   const cwd2 = process.cwd();
   const config = await loadContentConfig(cwd2);
-  const dbPath = config.dbPath.replace(/^~/, homedir37());
+  const dbPath = config.dbPath.replace(/^~/, homedir36());
   const db = initDatabase(dbPath);
   try {
     rejectContent(db, Number.parseInt(id, 10), reason);
@@ -70672,7 +70672,7 @@ __export(exports_content_subcommands, {
   approveContentCmd: () => approveContentCmd
 });
 import { existsSync as existsSync74, readFileSync as readFileSync18, unlinkSync as unlinkSync5 } from "node:fs";
-import { homedir as homedir38 } from "node:os";
+import { homedir as homedir37 } from "node:os";
 import { join as join140 } from "node:path";
 function isDaemonRunning() {
   const lockFile = join140(LOCK_DIR, `${LOCK_NAME2}.lock`);
@@ -70746,7 +70746,7 @@ async function statusContent() {
   } catch {}
 }
 async function logsContent(options2) {
-  const logDir = join140(homedir38(), ".claudekit", "logs");
+  const logDir = join140(homedir37(), ".claudekit", "logs");
   const dateStr = new Date().toISOString().slice(0, 10).replace(/-/g, "");
   const logPath = join140(logDir, `content-${dateStr}.log`);
   if (!existsSync74(logPath)) {
@@ -70780,12 +70780,12 @@ var init_content_subcommands = __esm(() => {
   init_setup_wizard();
   init_state_manager();
   init_content_review_commands();
-  LOCK_DIR = join140(homedir38(), ".claudekit", "locks");
+  LOCK_DIR = join140(homedir37(), ".claudekit", "locks");
 });
 
 // src/commands/content/content-command.ts
 import { existsSync as existsSync75, mkdirSync as mkdirSync8, unlinkSync as unlinkSync6, writeFileSync as writeFileSync6 } from "node:fs";
-import { homedir as homedir39 } from "node:os";
+import { homedir as homedir38 } from "node:os";
 import { join as join141 } from "node:path";
 async function contentCommand(options2) {
   const cwd2 = process.cwd();
@@ -70818,7 +70818,7 @@ async function contentCommand(options2) {
     if (!existsSync75(LOCK_DIR2))
       mkdirSync8(LOCK_DIR2, { recursive: true });
     writeFileSync6(LOCK_FILE, String(process.pid), "utf-8");
-    const dbPath = config.dbPath.replace(/^~/, homedir39());
+    const dbPath = config.dbPath.replace(/^~/, homedir38());
     const db = initDatabase(dbPath);
     contentLogger.info(`Database initialised at ${dbPath}`);
     const adapters = initializeAdapters(config);
@@ -70964,7 +70964,7 @@ var init_content_command = __esm(() => {
   init_publisher();
   init_review_manager();
   init_state_manager();
-  LOCK_DIR2 = join141(homedir39(), ".claudekit", "locks");
+  LOCK_DIR2 = join141(homedir38(), ".claudekit", "locks");
   LOCK_FILE = join141(LOCK_DIR2, "ck-content.lock");
 });
 
@@ -82793,9 +82793,9 @@ var import_proper_lockfile4 = __toESM(require_proper_lockfile(), 1);
 import { mkdir as mkdir19 } from "node:fs/promises";
 import os5 from "node:os";
 import { join as join75 } from "node:path";
-var LOCK_CONFIG = {
-  stale: 60000,
-  retries: 0
+var LOCK_CONFIGS = {
+  short: { stale: 60000, retries: 0 },
+  long: { stale: 300000, retries: 0 }
 };
 var activeLocks = new Set;
 var cleanupRegistered = false;
@@ -82805,8 +82805,7 @@ function getLocksDir() {
 function cleanupLocks() {
   for (const name of activeLocks) {
     try {
-      const lockPath = join75(getLocksDir(), `${name}.lock`);
-      import_proper_lockfile4.default.unlockSync(lockPath, { realpath: false });
+      import_proper_lockfile4.default.unlockSync(getLockPaths(name).resource, { realpath: false });
     } catch {
       try {
         logger.verbose(`Failed to cleanup lock: ${name}`);
@@ -82825,13 +82824,24 @@ async function ensureLocksDir() {
   const lockDir = getLocksDir();
   await mkdir19(lockDir, { recursive: true });
 }
-async function withProcessLock(lockName, fn) {
+function getLockPaths(lockName) {
+  const resource = join75(getLocksDir(), `${lockName}.lock`);
+  return { resource, lockfile: `${resource}.lock` };
+}
+async function withProcessLock(lockName, fn, duration = "short") {
   registerCleanupHandlers();
   await ensureLocksDir();
-  const lockPath = join75(getLocksDir(), `${lockName}.lock`);
+  const { resource: lockPath } = getLockPaths(lockName);
+  const config = LOCK_CONFIGS[duration];
   let release;
   try {
-    release = await import_proper_lockfile4.default.lock(lockPath, { ...LOCK_CONFIG, realpath: false });
+    release = await import_proper_lockfile4.default.lock(lockPath, {
+      ...config,
+      realpath: false,
+      onCompromised: duration === "long" ? (err) => {
+        logger.warning(`Lock "${lockName}" compromised: ${err.message}. Continuing...`);
+      } : undefined
+    });
     activeLocks.add(lockName);
     return await fn();
   } catch (e2) {
@@ -82841,11 +82851,24 @@ async function withProcessLock(lockName, fn) {
 
 Operation: ${lockName}
 Wait for it to complete or remove lock: ${lockPath}`);
+    }
+    if (error.code === "ECOMPROMISED") {
+      throw new Error(`Lock was compromised (stale or externally removed).
+
+Operation: ${lockName}
+Use --force to clear and restart.`);
     }
     throw e2;
   } finally {
     if (release) {
-      await release();
+      try {
+        await release();
+      } catch (releaseErr) {
+        const code = releaseErr.code;
+        if (code !== "ERELEASED") {
+          logger.warning(`Failed to release lock "${lockName}": ${releaseErr.message}`);
+        }
+      }
     }
     activeLocks.delete(lockName);
   }
@@ -101685,7 +101708,6 @@ ${import_picocolors38.default.bold(import_picocolors38.default.cyan(result.kitCo
 init_logger();
 import { existsSync as existsSync65 } from "node:fs";
 import { rm as rm16 } from "node:fs/promises";
-import { homedir as homedir33 } from "node:os";
 import { join as join131 } from "node:path";
 var import_picocolors39 = __toESM(require_picocolors(), 1);
 
@@ -102237,6 +102259,9 @@ async function invokeClaude(options2) {
     "--allowedTools",
     tools
   ];
+  if (outputFormat === "stream-json") {
+    args.push("--verbose");
+  }
   const child = spawn10("claude", args, {
     cwd: options2.cwd,
     stdio: ["pipe", "pipe", "pipe"],
@@ -102282,7 +102307,7 @@ function collectClaudeOutput(child, timeoutSec, verbose = false) {
   });
 }
 function logStreamEvent(chunk) {
-  for (const line of chunk.split(`
+  for (const line of chunk.replace(/\r/g, "").split(`
 `).filter(Boolean)) {
     try {
       const event = JSON.parse(line);
@@ -102310,7 +102335,7 @@ function logStreamEvent(chunk) {
   }
 }
 function parseStreamJsonOutput(stdout2) {
-  const lines = stdout2.split(`
+  const lines = stdout2.replace(/\r/g, "").split(`
 `).filter(Boolean);
   for (let i = lines.length - 1;i >= 0; i--) {
     try {
@@ -103410,11 +103435,13 @@ async function watchCommand(options2) {
         process.removeListener("SIGINT", shutdown);
         process.removeListener("SIGTERM", shutdown);
       }
-    });
+    }, "long");
   } catch (error) {
     const err = error;
     if (err.message?.includes("Another ClaudeKit process")) {
       logger.error("Another ck watch instance is already running. Use --force to override.");
+    } else if (err.message?.includes("Lock was compromised")) {
+      logger.error("Lock was compromised (stale or externally removed). Use --force to restart.");
     } else {
       watchLog.error("Watch command failed", err);
       console.error(`[ck watch] Fatal: ${err.message}`);
@@ -103497,9 +103524,12 @@ async function resetState(state, projectDir, watchLog) {
   watchLog.info(`Watch state reset (--force) for ${projectDir}`);
 }
 async function forceRemoveLock(watchLog) {
-  const lockPath = join131(homedir33(), ".claudekit", "locks", `${LOCK_NAME}.lock`);
+  const { resource, lockfile: lockfile5 } = getLockPaths(LOCK_NAME);
   try {
-    await rm16(lockPath, { recursive: true, force: true });
+    await Promise.all([
+      rm16(resource, { recursive: true, force: true }),
+      rm16(lockfile5, { recursive: true, force: true })
+    ]);
     watchLog.info("Removed existing lock file (--force)");
   } catch {}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "claudekit-cli",
-	"version": "3.41.0-dev.1",
+	"version": "3.41.0-dev.2",
 	"description": "CLI tool for bootstrapping and updating ClaudeKit projects",
 	"type": "module",
 	"repository": {