@4pm/cli 0.3.1 → 0.3.2

package/dist/index.js

@@ -3947,13 +3947,14 @@ async function runLink(serverUrl, explicitProfile) {
 
 // src/commands/start.ts
 import { spawn as spawn2 } from "child_process";
+import { join as join9 } from "path";
 
 // src/core/update.ts
 import { execSync as execSync2 } from "child_process";
 import { createHash as createHash2, createPublicKey, verify } from "crypto";
-import { mkdtempSync, writeFileSync as writeFileSync3 } from "fs";
+import { mkdtempSync, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "fs";
 import { tmpdir } from "os";
-import { dirname, join as join3, sep } from "path";
+import { dirname as dirname2, join as join4, sep } from "path";
 
 // src/config/signing.ts
 var CLI_SIGNING_PUBLIC_KEY = `
@@ -3963,7 +3964,19 @@ MCowBQYDK2VwAyEARlfzjaFhe5bhRrMp/ZuH6sVqg/S7f8B1dliuF21iDTw=
 `;
 
 // src/version.ts
-var CLI_VERSION = "0.3.1";
+import { readFileSync as readFileSync4 } from "fs";
+import { dirname, join as join3 } from "path";
+import { fileURLToPath } from "url";
+function readCliVersion() {
+  try {
+    const here = dirname(fileURLToPath(import.meta.url));
+    const pkg = JSON.parse(readFileSync4(join3(here, "..", "package.json"), "utf8"));
+    return pkg.version ?? "0.0.0";
+  } catch {
+    return "0.0.0";
+  }
+}
+var CLI_VERSION = readCliVersion();
 
 // src/core/update.ts
 function compareSemver(a, b) {
@@ -3978,6 +3991,14 @@ function compareSemver(a, b) {
 function installedViaNpm() {
   return (process.argv[1] ?? "").split(sep).includes("node_modules");
 }
+function readInstalledVersion() {
+  try {
+    const pkgPath = join4(dirname2(dirname2(process.argv[1] ?? ".")), "package.json");
+    return JSON.parse(readFileSync5(pkgPath, "utf8")).version ?? "0.0.0";
+  } catch {
+    return "0.0.0";
+  }
+}
 function updateViaNpm(version) {
   execSync2(`npm i -g @4pm/cli@${version}`, { stdio: "inherit" });
 }
@@ -4004,9 +4025,9 @@ async function updateViaDownload(tarballUrl, checksum, signature) {
       throw new Error("Invalid tarball signature \u2014 aborting update (ADR-0015).");
     }
   }
-  const tmp = join3(mkdtempSync(join3(tmpdir(), "4pm-update-")), "cli.tgz");
+  const tmp = join4(mkdtempSync(join4(tmpdir(), "4pm-update-")), "cli.tgz");
   writeFileSync3(tmp, buf);
-  const installRoot = dirname(dirname(process.argv[1] ?? "."));
+  const installRoot = dirname2(dirname2(process.argv[1] ?? "."));
   execSync2(`tar -xzf "${tmp}" -C "${installRoot}" --strip-components=1`, {
     stdio: "inherit"
   });
@@ -4033,6 +4054,7 @@ async function updateToLatest(serverUrl) {
   }
 }
 async function checkAndUpdate(serverUrl, autoUpdate) {
+  if (CLI_VERSION.startsWith("0.0.0")) return { action: "none" };
   let meta;
   try {
     meta = await fetchCliVersion(serverUrl);
@@ -4062,7 +4084,6 @@ async function checkAndUpdate(serverUrl, autoUpdate) {
         meta.source.signature
       );
     }
-    return { action: "updated", version: meta.latest };
   } catch (err) {
     if (mandatory) {
       console.error(`Update failed: ${err}`);
@@ -4071,6 +4092,17 @@ async function checkAndUpdate(serverUrl, autoUpdate) {
     console.warn(`Update failed (skipping \u2014 not mandatory): ${err}`);
     return { action: "none" };
   }
+  const installed = readInstalledVersion();
+  if (compareSemver(installed, meta.latest) < 0) {
+    const msg = `Update reported success but the installed version is still ${installed} (expected ${meta.latest}) \u2014 it did not apply to the running install (check the global npm prefix vs the running binary).`;
+    if (mandatory) {
+      console.error(msg);
+      return { action: "blocked", minSupported: meta.minSupported };
+    }
+    console.warn(`${msg} Skipping restart.`);
+    return { action: "none" };
+  }
+  return { action: "updated", version: meta.latest };
 }
 
 // src/core/ws-client.ts
@@ -4628,8 +4660,8 @@ ${JSON.stringify(req.spec)}`;
 }
 
 // src/core/command-history.ts
-import { existsSync as existsSync4, readFileSync as readFileSync4, writeFileSync as writeFileSync4 } from "fs";
-import { join as join4 } from "path";
+import { existsSync as existsSync4, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "fs";
+import { join as join5 } from "path";
 var MAX_ENTRIES = 1e3;
 var filePath = null;
 var entries = [];
@@ -4691,10 +4723,10 @@ async function uploadHistory(cfg) {
   }
 }
 function initCommandHistory(profileDir2, profileName, uploadMinutes = 10) {
-  filePath = join4(profileDir2, "command-history.json");
+  filePath = join5(profileDir2, "command-history.json");
   if (existsSync4(filePath)) {
     try {
-      entries = JSON.parse(readFileSync4(filePath, "utf8"));
+      entries = JSON.parse(readFileSync6(filePath, "utf8"));
     } catch {
       entries = [];
     }
@@ -4767,12 +4799,12 @@ async function readWorkerFile(path) {
 // src/core/git-diff.ts
 import { readFile as readFile2 } from "fs/promises";
 import { execFile as execFile2 } from "child_process";
-import { basename, dirname as dirname2, resolve as resolve3 } from "path";
+import { basename, dirname as dirname3, resolve as resolve3 } from "path";
 import { promisify as promisify2 } from "util";
 var run2 = promisify2(execFile2);
 async function gitDiff(path) {
   const target = resolve3(path);
-  const dir = dirname2(target);
+  const dir = dirname3(target);
   const base = basename(target);
   let newContent = "";
   try {
@@ -4826,13 +4858,13 @@ ${stderr}`;
 // src/core/scaffold.ts
 import { cp, mkdir, writeFile } from "fs/promises";
 import { execFile as execFile4 } from "child_process";
-import { dirname as dirname3, join as join5, resolve as resolve4 } from "path";
-import { fileURLToPath } from "url";
+import { dirname as dirname4, join as join6, resolve as resolve4 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
 import { promisify as promisify4 } from "util";
 var run4 = promisify4(execFile4);
 function sampleDir() {
   if (process.env.SCAFFOLD_SAMPLE_DIR) return process.env.SCAFFOLD_SAMPLE_DIR;
-  const here = dirname3(fileURLToPath(import.meta.url));
+  const here = dirname4(fileURLToPath2(import.meta.url));
   return resolve4(here, "../../project-sample");
 }
 async function scaffoldProject(payload, onProgress) {
@@ -4845,7 +4877,7 @@ async function scaffoldProject(payload, onProgress) {
     if (payload.spec) {
       emit("spec", "Writing project.spec.json\u2026");
       await writeFile(
-        join5(target, "project.spec.json"),
+        join6(target, "project.spec.json"),
         JSON.stringify(payload.spec, null, 2),
         "utf8"
       );
@@ -4875,6 +4907,72 @@ async function addProject(payload, onProgress) {
   }
 }
 
+// src/common/logger/logger.ts
+import { appendFile, mkdir as mkdir2, readdir as readdir2, unlink } from "fs/promises";
+import { join as join7 } from "path";
+var LEVEL_ORDER = { error: 0, warn: 1, info: 2, debug: 3 };
+var DAY_MS = 24 * 60 * 60 * 1e3;
+var DEFAULT_RETENTION_DAYS = 14;
+var CliLogger = class {
+  dir = null;
+  minLevel = "info";
+  base = null;
+  retentionDays = DEFAULT_RETENTION_DAYS;
+  queue = Promise.resolve();
+  /** Wire the profile log dir + level + base context; runs a retention sweep. */
+  configure(opts) {
+    this.dir = opts.dir;
+    this.minLevel = opts.level;
+    this.base = opts.base;
+    this.retentionDays = opts.retentionDays ?? DEFAULT_RETENTION_DAYS;
+    void this.cleanupOldLogs();
+  }
+  /** Log an error-level event. */
+  error(event, fields) {
+    this.write("error", event, fields);
+  }
+  /** Log a warn-level event. */
+  warn(event, fields) {
+    this.write("warn", event, fields);
+  }
+  /** Log an info-level event. */
+  info(event, fields) {
+    this.write("info", event, fields);
+  }
+  /** Log a debug-level event. */
+  debug(event, fields) {
+    this.write("debug", event, fields);
+  }
+  /** Serialize one JSONL line into today's file (no-op until configured / below level). */
+  write(level, event, fields) {
+    const dir = this.dir;
+    if (!dir || !this.base) return;
+    if (LEVEL_ORDER[level] > LEVEL_ORDER[this.minLevel]) return;
+    const timestamp = (/* @__PURE__ */ new Date()).toISOString();
+    const entry = { timestamp, level, ...this.base, event, ...fields };
+    const line = JSON.stringify(entry) + "\n";
+    const path = join7(dir, `cli-${timestamp.slice(0, 10)}.jsonl`);
+    this.queue = this.queue.then(() => mkdir2(dir, { recursive: true })).then(() => appendFile(path, line, "utf8")).catch((err) => {
+      console.warn(`Failed to write cli log: ${err}`);
+    });
+  }
+  /** Delete cli log files older than the retention window (best-effort). */
+  async cleanupOldLogs() {
+    const dir = this.dir;
+    if (!dir) return;
+    const files = await readdir2(dir).catch(() => []);
+    const cutoff = Date.now() - this.retentionDays * DAY_MS;
+    for (const file of files) {
+      const match = /^cli-(\d{4}-\d{2}-\d{2})\.jsonl$/.exec(file);
+      if (!match) continue;
+      if ((/* @__PURE__ */ new Date(`${match[1]}T00:00:00Z`)).getTime() < cutoff) {
+        await unlink(join7(dir, file)).catch(() => void 0);
+      }
+    }
+  }
+};
+var logger = new CliLogger();
+
 // src/core/ws-client.ts
 var HEARTBEAT_MS = 3e4;
 var MAX_HASHCODE_INVALID_RETRIES = 5;
@@ -4931,6 +5029,7 @@ var WsClient = class {
       }
       if (this.stopped) return;
       const wait = backoffJitterMs(Math.min(attempt, 6), 1e3, 6e4);
+      logger.info("ws.reconnect", { attempt, waitMs: wait });
       console.log(`Reconnecting in ${Math.round(wait / 1e3)}s\u2026`);
       await sleep(wait);
     }
@@ -4969,6 +5068,7 @@ var WsClient = class {
         socket.on("close", (code) => {
           this.clearHeartbeat();
           this.sessionKey = null;
+          logger.debug("ws.close", { code });
           if (code === CLOSE_DRAINING) {
             console.log("Server draining \u2014 will reconnect (backoff + jitter).");
           }
@@ -4988,6 +5088,7 @@ var WsClient = class {
     if ("type" in message) {
       if (message.type === "hello_ack" && this.ecdh) {
         this.sessionKey = deriveSessionKey(this.ecdh, message.pubkey);
+        logger.info("ws.connected", { version: CLI_VERSION });
         console.log("\u2714 Connected to the server (session encryption ready).");
         this.sendMachineStatus();
         this.flushOfflineBuffer();
@@ -4995,6 +5096,7 @@ var WsClient = class {
         return;
       }
       if (message.type === "error") {
+        logger.warn("ws.error", { errorCode: message.errorCode });
         if (["LINK_REVOKED", "HASHCODE_EXPIRED"].includes(message.errorCode)) {
           this.logout(message.errorCode);
           return;
@@ -5037,6 +5139,10 @@ var WsClient = class {
     switch (message.channel) {
       case WsChannels.COMMAND_DISPATCH: {
         const dispatch = payload;
+        logger.info("command.dispatch", {
+          commandId: dispatch.commandId,
+          cmd: dispatch.cmd
+        });
         recordCommand({
           commandId: dispatch.commandId,
           projectId: dispatch.projectId,
@@ -5211,16 +5317,17 @@ var WsClient = class {
     this.stopped = true;
     this.clearHeartbeat();
     this.socket?.close();
+    logger.warn("ws.logout", { reason });
     deleteCredential(this.context.profileDir);
     console.error(`Link is no longer valid (${reason}) \u2014 deleted .cre. Run \`4pm link\` to pair again.`);
   }
 };
 
 // src/core/instance-lock.ts
-import { readFileSync as readFileSync5, rmSync as rmSync3, writeFileSync as writeFileSync5 } from "fs";
-import { join as join6 } from "path";
+import { readFileSync as readFileSync7, rmSync as rmSync3, writeFileSync as writeFileSync5 } from "fs";
+import { join as join8 } from "path";
 function lockPath(profileDir2) {
-  return join6(profileDir2, "start.lock");
+  return join8(profileDir2, "start.lock");
 }
 function isAlive(pid) {
   try {
@@ -5232,7 +5339,7 @@ function isAlive(pid) {
 }
 function lockHolder(profileDir2) {
   try {
-    const pid = Number.parseInt(readFileSync5(lockPath(profileDir2), "utf8").trim(), 10);
+    const pid = Number.parseInt(readFileSync7(lockPath(profileDir2), "utf8").trim(), 10);
     if (Number.isInteger(pid) && pid > 0 && isAlive(pid)) return pid;
   } catch {
   }
@@ -5245,13 +5352,19 @@ function acquireInstanceLock(profileDir2) {
 }
 function releaseInstanceLock(profileDir2) {
   try {
-    const pid = Number.parseInt(readFileSync5(lockPath(profileDir2), "utf8").trim(), 10);
+    const pid = Number.parseInt(readFileSync7(lockPath(profileDir2), "utf8").trim(), 10);
     if (pid === process.pid) rmSync3(lockPath(profileDir2), { force: true });
   } catch {
   }
 }
 
 // src/commands/start.ts
+function resolveLogLevel() {
+  if (process.argv.includes("--verbose")) return "debug";
+  const env = process.env.FOURPM_LOG_LEVEL;
+  if (env === "error" || env === "warn" || env === "info" || env === "debug") return env;
+  return "info";
+}
 async function runStart(profileDir2, profileName) {
   const credential = readCredential(profileDir2, profileName);
   if (!credential) {
@@ -5261,10 +5374,17 @@ async function runStart(profileDir2, profileName) {
     process.exitCode = 1;
     return;
   }
+  logger.configure({
+    dir: join9(profileDir2, "logs"),
+    level: resolveLogLevel(),
+    base: { version: CLI_VERSION, profile: profileName, scope: credential.scope }
+  });
+  logger.info("cli.start", { serverUrl: credential.serverUrl });
   const config = readProfileConfig(profileDir2);
   const autoUpdate = config.autoUpdate !== false && process.env.FOURPM_NO_UPDATE !== "1";
   const result = await checkAndUpdate(credential.serverUrl, autoUpdate);
   if (result.action === "blocked") {
+    logger.error("update.blocked", { minSupported: result.minSupported });
     console.error(
       `CLI is older than minSupported (${result.minSupported}) and the update failed \u2014 cannot connect.`
     );
@@ -5272,6 +5392,7 @@ async function runStart(profileDir2, profileName) {
     return;
   }
   if (result.action === "updated") {
+    logger.info("update.updated", { version: result.version });
     console.log("Restarting with the new version\u2026");
     const child = spawn2(process.execPath, process.argv.slice(1), {
       stdio: "inherit",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4pm/cli",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "private": false,
   "description": "4PM CLI — drives Claude/Codex CLIs on AI worker machines (Node + TypeScript)",
   "type": "module",