@4pm/cli 1.2.4 → 1.2.6

package/dist/index.js

@@ -28211,7 +28211,6 @@ import { join as join2 } from "path";
 // src/config/profile.ts
 import {
   existsSync,
-  mkdirSync,
   readdirSync,
   readFileSync,
   rmSync,
@@ -28219,6 +28218,30 @@ import {
 } from "fs";
 import { homedir } from "os";
 import { join } from "path";
+
+// src/common/io/ensure-dir.ts
+import { mkdirSync } from "fs";
+var CLI_IMAGE = "ghcr.io/4azuo/4pm-cli:full";
+function ensureDir(dir2) {
+  try {
+    mkdirSync(dir2, { recursive: true });
+  } catch (err) {
+    const code = err.code;
+    if (code === "EACCES" || code === "EPERM") {
+      throw new Error(
+        `Cannot write "${dir2}" \u2014 the mounted home is owned by root. A reused Docker volume or a host bind-mount shadows the image's node-owned home, and the cli runs as the unprivileged "node" user (uid 1000), so it cannot chown it.
+Fix the mount ONCE, then retry:
+  docker run --rm --user 0 --cap-drop=ALL --cap-add=CHOWN --cap-add=DAC_OVERRIDE \\
+    --security-opt=no-new-privileges --entrypoint chown \\
+    -v <volume>:/home/node/.4pm ${CLI_IMAGE} -R node:node /home/node/.4pm
+(host bind-mount: run \`sudo chown -R 1000:1000 <host-path>\` on the host instead; a FRESH named volume needs none of this.)`
+      );
+    }
+    throw err;
+  }
+}
+
+// src/config/profile.ts
 var DEFAULT_PROFILE = "default";
 function defaultPointerPath() {
   return join(homedir(), ".4pm", "default");
@@ -28232,7 +28255,7 @@ function defaultProfileName() {
   return DEFAULT_PROFILE;
 }
 function writeDefaultProfile(userId) {
-  mkdirSync(join(homedir(), ".4pm"), { recursive: true });
+  ensureDir(join(homedir(), ".4pm"));
   writeFileSync(defaultPointerPath(), userId, "utf8");
 }
 function clearDefaultProfileIf(name) {
@@ -28269,7 +28292,7 @@ function listProfiles() {
 }
 function profileDir(name) {
   const dir2 = join(homedir(), ".4pm", "profiles", name);
-  mkdirSync(dir2, { recursive: true });
+  ensureDir(dir2);
   return dir2;
 }
 function defaultProfileConfig() {
@@ -28492,7 +28515,7 @@ ${INSECURE_URL_WARNING}
 `);
     console.log("2. The web will show a confirmation code \u2014 paste it here.");
     const rl = createInterface({ input: process.stdin, output: process.stdout });
-    const hashcode2 = (await rl.question("confirmation code: ")).trim();
+    const hashcode2 = (await rl.question("Confirmation code: ")).trim();
     rl.close();
     result = await confirmPairing(serverUrl, hashcode2, collectFingerprint());
   }
@@ -29803,7 +29826,7 @@ async function runAiFailover(plan, commandId, cwd2, handlers) {
   let finalExit = -1;
   for (let i = 0; i < total; i++) {
     const attempt = plan.attempts[i];
-    if (total > 1) handlers.onAttemptStart(attempt.label, i, total);
+    if (total > 1) handlers.onAttemptStart(attempt.label, i, total, attempt.cmd);
     const parser = createAiStreamParser(attempt.cmd);
     let captured = "";
     const emit = (raw) => {
@@ -29911,6 +29934,10 @@ function resolveClaudeAuthMode(config) {
 function isUnifiedConfig(config) {
   return Array.isArray(config.aiProfiles) && config.aiProfiles.some(isUsableCredential);
 }
+function activeProvider(config) {
+  const v = config.aiCli?.trim();
+  return v && AI_PROVIDERS.includes(v) ? v : null;
+}
 function claudeProfilesOf(config) {
   if (isUnifiedConfig(config)) return config.aiProfiles.filter((c) => c.provider === "claude");
   return config.claudeHome ?? [];
@@ -29984,7 +30011,18 @@ function planAiRun(prompt, config, hint = {}) {
 }
 function planUnifiedRun(prompt, config, workingCredential) {
   const baseEnv = config.aiEnv ?? {};
-  const resolved = config.aiProfiles.filter(isUsableCredential).map((cred) => {
+  const active = activeProvider(config);
+  const usable = config.aiProfiles.filter(isUsableCredential);
+  const scoped = active ? usable.filter((c) => c.provider === active) : usable;
+  if (active && scoped.length === 0) {
+    return {
+      cmd: active,
+      attempts: [
+        { cmd: active, label: "default", dir: null, key: null, args: buildRunArgs({ profile: "" }, active, prompt), env: { ...baseEnv } }
+      ]
+    };
+  }
+  const resolved = scoped.map((cred) => {
     const cmd = cred.provider;
     const dir2 = resolveHomePath(cred.profile);
     return { cred, cmd, dir: dir2, key: credentialKey(cmd, dir2), envVar: profileEnvVar(cmd) };
@@ -33080,8 +33118,8 @@ var WsClient = class {
           this.bus.push({ source: origin, kind: "out", text: resultBuf });
         }
       },
-      onAttemptStart: (label, index, total) => {
-        const text = `\u2192 trying ${plan.cmd} profile "${label}" (${index + 1}/${total})\u2026`;
+      onAttemptStart: (label, index, total, cmd2) => {
+        const text = `\u2192 trying ${cmd2} profile "${label}" (${index + 1}/${total})\u2026`;
         this.bus.push({ source: origin, kind: "log", text });
         this.send(WsChannels.COMMAND_OUTPUT, { commandId, seq: seq++, chunk: `${text}
 `, log: true });
@@ -33596,7 +33634,7 @@ function isAlive(pid) {
 function lockHolder(profileDir2) {
   try {
     const pid = Number.parseInt(readFileSync15(lockPath(profileDir2), "utf8").trim(), 10);
-    if (Number.isInteger(pid) && pid > 0 && isAlive(pid)) return pid;
+    if (Number.isInteger(pid) && pid > 0 && pid !== process.pid && isAlive(pid)) return pid;
   } catch {
   }
   return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4pm/cli",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "private": false,
   "description": "4PM CLI — drives Claude/Codex CLIs on AI worker machines (Node + TypeScript)",
   "license": "LicenseRef-4PM-Source-Available",