@4pm/cli 0.6.0 → 0.7.0

package/README.md

@@ -1,16 +1,16 @@
 # @4pm/cli
 
-**Agent chạy trên máy worker** — nhận lệnh từ `@4pm/server` qua WebSocket và điều phối
-các CLI AI (`claude` / `codex`) cùng công cụ khác (`git`, `gh`, `glab`, `shell`).
+**An agent running on the worker machine** — receives commands from `@4pm/server` over WebSocket and orchestrates
+the AI CLIs (`claude` / `codex`) plus other tools (`git`, `gh`, `glab`, `shell`).
 Node ESM + TypeScript.
 
-Vòng đời: **pairing** với server bằng hashcode (file `.cre`) → xin `ws_token` → mở
-WebSocket TLS → nhận lệnh → **spawn tiến trình con**, gom output (backpressure) trả về
-server. Nhiều instance trên một máy dùng profile riêng, server gom về một **worker**.
+Lifecycle: **pairing** with the server via a hashcode (the `.cre` file) → request a `ws_token` → open a
+TLS WebSocket → receive commands → **spawn child processes**, gather the output (backpressure) back to the
+server. Multiple instances on one machine use separate profiles, and the server groups them into one **worker**.
 
 ```bash
 pnpm --filter @4pm/cli dev
 ```
 
-> Tổ chức mã, quy ước & phần còn thiếu: [`CLAUDE.md`](./CLAUDE.md).
-> Đặc tả hành vi cli: [`11-docs/61-cli/`](../../11-docs/61-cli/README.md).
+> Code organization, conventions & what's missing: [`CLAUDE.md`](./CLAUDE.md).
+> The cli behavior spec: [`11-docs/61-cli/`](../../11-docs/61-cli/README.md).

package/dist/index.js

@@ -24469,6 +24469,27 @@ function profileDir(name) {
   mkdirSync(dir2, { recursive: true });
   return dir2;
 }
+function defaultProfileConfig() {
+  return {
+    aiCli: "claude",
+    // Lists so failover across profiles is discoverable (ADR-0057) — add more objects.
+    // `args` are the full per-CLI defaults (claude stream-json for metering — ADR-0072).
+    // `model` = the CLI's `--model` flag; default "sonnet" — the balanced mid-price tier
+    // (cheaper than opus, more capable than haiku). "" ⇒ the CLI's own default model.
+    claudeHome: [
+      { profile: ".claude", args: ["-p", "--output-format", "stream-json", "--verbose"], model: "sonnet" }
+    ],
+    codexHome: [{ profile: ".codex", args: ["exec"], model: "" }],
+    antigravityHome: [],
+    autoUpdate: true,
+    commandHistoryUploadMinutes: 10
+  };
+}
+function ensureProfileConfig(dir2) {
+  if (existsSync(join(dir2, "config.json"))) return false;
+  writeProfileConfig(dir2, defaultProfileConfig());
+  return true;
+}
 function readProfileConfig(dir2) {
   const path = join(dir2, "config.json");
   if (!existsSync(path)) return {};
@@ -24483,6 +24504,10 @@ function writeProfileConfig(dir2, patch) {
   writeFileSync(join(dir2, "config.json"), JSON.stringify(merged, null, 2), "utf8");
   return merged;
 }
+function overwriteProfileConfig(dir2, config) {
+  writeFileSync(join(dir2, "config.json"), JSON.stringify(config, null, 2), "utf8");
+  return config;
+}
 function deleteProfileConfigKey(dir2, key) {
   const config = readProfileConfig(dir2);
   delete config[key];
@@ -24638,15 +24663,17 @@ async function runLink(serverUrl, explicitProfile) {
   );
   const profileName = explicitProfile ?? sanitizeProfileName(username);
   const existed = readCredential(profileDir(profileName), profileName) != null;
-  writeCredential(profileDir(profileName), {
+  const dir2 = profileDir(profileName);
+  writeCredential(dir2, {
     serverUrl,
     hashcode3,
     scope,
     // decided by the server from the pairing user (ADR-0010); shown in the TUI
     pairedAt: (/* @__PURE__ */ new Date()).toISOString()
   });
+  ensureProfileConfig(dir2);
   if (projectName && scope === "project") {
-    const folder = join3(profileDir(profileName), projectName);
+    const folder = join3(dir2, projectName);
     mkdirSync2(folder, { recursive: true });
     console.log(`\u2714 Created physic project folder: ${folder}`);
   }
@@ -24963,6 +24990,9 @@ var PermissionCode = {
   // billing
   BILLING_READ: "billing.read",
   BILLING_MANAGE: "billing.manage",
+  // org template files (ADR-0113) — ADMIN + PM manage the org's template library
+  TEMPLATE_READ: "template.read",
+  TEMPLATE_WRITE: "template.write",
   // integration (community-server — ADR-0058; served by @4pm/community)
   INTEGRATION_READ: "integration.read",
   INTEGRATION_CONNECT: "integration.connect",
@@ -25006,6 +25036,8 @@ var ROLE_DEFAULT_PERMISSIONS = {
     P.USER_INVITE,
     P.QUOTA_READ,
     P.QUOTA_MANAGE,
+    P.TEMPLATE_READ,
+    P.TEMPLATE_WRITE,
     P.TEAM_LIST,
     P.TEAM_CREATE,
     P.TEAM_READ,
@@ -29351,16 +29383,30 @@ var resetPasswordRequestSchema = external_exports.object({
 
 // ../../22-packages/11-shared/31-dto/src/org.ts
 var CLI_SETTINGS_BOUNDS = {
-  reconnectMaxBackoffSec: { min: 5, max: 600 },
+  reconnectMaxBackoffSec: { min: 5, max: 60 },
   autoUpdateHour: { min: 0, max: 23 }
 };
+var orgAliasSchema = external_exports.string().regex(/^([a-z0-9-]{3,40})?$/, "alias must be 3\u201340 chars of a\u2013z, 0\u20139, -");
 var updateOrgRequestSchema = external_exports.object({
   name: external_exports.string().min(1).max(100).optional(),
+  // ADMIN-only login alias (ADR-0111); empty string clears it.
+  alias: orgAliasSchema.optional(),
   settings: external_exports.record(external_exports.unknown()).optional()
 });
 
 // ../../22-packages/11-shared/31-dto/src/user.ts
 var AVATAR_MAX_BYTES = 2 * 1024 * 1024;
+var USAGE_ALERT_METRICS = ["session5h", "weekly", "monthlyTokens"];
+var usageAlertRuleSchema = external_exports.object({
+  id: external_exports.string().min(1).max(64),
+  metric: external_exports.enum(USAGE_ALERT_METRICS),
+  threshold: external_exports.number().int().min(1),
+  email: external_exports.union([emailSchema, external_exports.literal("")]).optional(),
+  enabled: external_exports.boolean().default(true)
+});
+var userAlertsSchema = external_exports.object({
+  rules: external_exports.array(usageAlertRuleSchema).max(20).default([])
+});
 var rolesSchema = external_exports.array(external_exports.enum(ALL_ROLES)).min(1).refine((roles) => isValidRoleSet(roles), {
   message: "ADMIN/MACHINE cannot be combined with other roles"
 });
@@ -29382,7 +29428,11 @@ var updateUserRequestSchema = external_exports.object({
   email: emailSchema.optional(),
   phone: phoneSchema.nullable().optional(),
   roles: rolesSchema.optional(),
-  ipAllowlist: ipAllowlistSchema.optional()
+  ipAllowlist: ipAllowlistSchema.optional(),
+  // Usage-alert rules (ADR-0110) — manager-only, like the IP allowlist.
+  alerts: userAlertsSchema.optional(),
+  // cli data retention days (ADR-0115) — manager-only; capped at the plan's retentionDays.
+  cliRetentionDays: external_exports.number().int().min(0).max(3650).optional()
 });
 var setUserPasswordRequestSchema = external_exports.object({
   password: passwordSchema
@@ -29421,6 +29471,9 @@ var attachTeamUserRequestSchema = external_exports.object({
   isLead: external_exports.boolean().optional()
 });
 
+// ../../22-packages/11-shared/31-dto/src/template.ts
+var TEMPLATE_KINDS = ["report", "est", "wbs", "proposal", "feasibility"];
+
 // ../../22-packages/11-shared/31-dto/src/project.ts
 var listProjectsQuerySchema = baseRequestSchema.extend({
   pinned: pinnedFilterSchema,
@@ -29485,6 +29538,17 @@ var putSpecDraftRequestSchema = external_exports.object({
   spec: external_exports.record(external_exports.unknown()),
   specVersion: external_exports.number().int().positive().optional()
 });
+var putProjectSpecRequestSchema = external_exports.object({
+  spec: external_exports.record(external_exports.unknown())
+});
+var ARTIFACT_MAX_BYTES = 512 * 1024;
+var listArtifactsQuerySchema = external_exports.object({
+  kind: external_exports.enum(TEMPLATE_KINDS).optional()
+});
+var createArtifactRequestSchema = external_exports.object({
+  kind: external_exports.enum(TEMPLATE_KINDS),
+  content: external_exports.string().min(1).max(ARTIFACT_MAX_BYTES)
+});
 var repoSpecSchema = external_exports.object({
   /** Role label (e.g. "docs" / "web" / "server") — descriptive, not constrained. */
   role: external_exports.string().max(60).optional().default(""),
@@ -29556,10 +29620,26 @@ var createFromSpecRequestSchema = external_exports.object({
 });
 var addRepoRequestSchema = external_exports.object({
   projectId: external_exports.string().uuid(),
-  path: external_exports.string().min(1).max(500),
-  /** Repo to clone; empty ⇒ `git init` in place. */
-  repoUrl: external_exports.string().url().max(500).optional(),
-  provider: external_exports.enum(["gh", "glab"]).optional()
+  repos: external_exports.array(repoSpecSchema).min(1)
+}).superRefine((v, ctx) => {
+  const primaries = v.repos.filter((r) => r.primary).length;
+  if (primaries !== 1) {
+    ctx.addIssue({
+      code: external_exports.ZodIssueCode.custom,
+      path: ["repos"],
+      message: "Exactly one repo must be primary"
+    });
+  }
+  for (let i = 0; i < v.repos.length; i++) {
+    const r = v.repos[i];
+    if (r && r.op === "existing" && !r.url) {
+      ctx.addIssue({
+        code: external_exports.ZodIssueCode.custom,
+        path: ["repos", i, "url"],
+        message: "An existing repo requires a url"
+      });
+    }
+  }
 });
 
 // ../../22-packages/11-shared/31-dto/src/activity.ts
@@ -29659,7 +29739,11 @@ var dispatchCommandRequestSchema = external_exports.object({
   }
 });
 var listCommandsQuerySchema = baseRequestSchema.extend({
-  projectId: external_exports.string().uuid()
+  projectId: external_exports.string().uuid(),
+  // Optional search filters (command-0005): `search` (from BaseRequest) matches the command
+  // text/status; `from`/`to` are an inclusive `YYYY-MM-DD` date range over `startedAt`.
+  from: external_exports.string().optional(),
+  to: external_exports.string().optional()
 });
 
 // ../../22-packages/11-shared/31-dto/src/invitation.ts
@@ -29757,8 +29841,33 @@ var planEntitlementsSchema = external_exports.object({
   /** Allowed to use Community/4rum. */
   community: external_exports.boolean().default(false),
   /** Retention cap (days) for log/command/chat; null = unlimited. */
-  retentionDays: external_exports.number().int().min(1).nullable().default(null)
+  retentionDays: external_exports.number().int().min(1).nullable().default(null),
+  /**
+   * Total 4PM-hosted storage per org (bytes). Originally the template-file cap (ADR-0113),
+   * broadened by ADR-0122 to the org's WHOLE hosted storage: messages + command history
+   * (cli input/output/log) + files (templates/attachments/artifacts). `null` = unlimited.
+   */
+  templateStorageBytes: external_exports.number().int().min(0).nullable().default(null),
+  /** Per-file cap for a template upload (bytes — ADR-0113); null = unlimited. */
+  templateFileMaxBytes: external_exports.number().int().min(0).nullable().default(null),
+  /**
+   * How many 4PM-hosted machine-users the org may rent (ADR-0126). Base plans grant `0`;
+   * raised only by the `rented_machine` add-on (ADR-0123/0124). Never `null` (not "unlimited").
+   */
+  rentedMachineSeats: external_exports.number().int().min(0).default(0)
 });
+var DEFAULT_ENTITLEMENTS = {
+  maxUsers: 5,
+  maxProjects: 1,
+  teams: false,
+  community: false,
+  retentionDays: 30,
+  // Free tier: 100 MB total, 10 MB per file (ADR-0113).
+  templateStorageBytes: 100 * 1024 * 1024,
+  templateFileMaxBytes: 10 * 1024 * 1024,
+  // No rented machine-user seats by default — bought via the `rented_machine` add-on (ADR-0126).
+  rentedMachineSeats: 0
+};
 var checkoutRequestSchema = external_exports.object({
   planCode: external_exports.string().min(1).max(50),
   provider: external_exports.enum([PaymentProvider.STRIPE, PaymentProvider.PAYPAL]).optional()
@@ -29774,6 +29883,16 @@ var assignPlanRequestSchema = external_exports.object({
   /** Cycle length in days (defaults to 30). */
   periodDays: external_exports.number().int().min(1).max(366).default(30)
 });
+var addonBuyRequestSchema = external_exports.object({
+  code: external_exports.string().min(1).max(50),
+  quantity: external_exports.number().int().min(1).max(1e3),
+  /** Card path only; ignored when the org pays by credit (ADR-0104/0123). */
+  provider: external_exports.enum([PaymentProvider.STRIPE, PaymentProvider.PAYPAL]).optional()
+});
+var addonChangeRequestSchema = external_exports.object({
+  quantity: external_exports.number().int().min(0).max(1e3),
+  provider: external_exports.enum([PaymentProvider.STRIPE, PaymentProvider.PAYPAL]).optional()
+});
 
 // ../../22-packages/11-shared/31-dto/src/search.ts
 var SearchHitType = {
@@ -29787,11 +29906,11 @@ var SearchHitType = {
   MILESTONE: "milestone",
   /** Page/wiki (confluence + project docs — community). */
   PAGE: "page",
-  /** Message trong channel (Teams channel — community). */
+  /** A message in a channel (Teams channel — community). */
   MESSAGE: "message",
-  /** Message direct/group (lịch sử trò chuyện — community). */
+  /** A direct/group message (chat history — community). */
   CHAT: "chat",
-  /** Bài 4rum (community news/forum). */
+  /** A forum post (community news/forum). */
   POST: "post"
 };
 var searchQuerySchema = external_exports.object({
@@ -29857,8 +29976,14 @@ var WsChannels = {
   MACHINE_USAGE: "machine.usage",
   // cli → server: durable per-command history record on finish (ADR-0072)
   COMMAND_HISTORY: "command.history",
+  // cli → server: periodic upload of the cli's own JSONL log file (ADR-0122) — stored
+  // server-side + counted in the machine user's storage footprint.
+  MACHINE_LOG: "machine.log",
   // server → cli (reply): tail the cli's own JSONL logs on demand (ADR-0072)
   LOG_READ: "log.read",
+  // server → cli (reply): read a finished command's captured output on demand (ADR-0115) —
+  // cli stores command-output/{commandId}.log; returns null when pruned/unavailable.
+  COMMAND_OUTPUT_READ: "command.output-read",
   // outbound review (ADR-0082): machine→server request, server→outbound evaluate, result back
   REVIEW_REQUEST: "review.request",
   REVIEW_EVALUATE: "review.evaluate",
@@ -29987,7 +30112,7 @@ import { spawn } from "child_process";
 
 // src/common/logger/logger.ts
 import { appendFile, mkdir, readdir, unlink } from "fs/promises";
-import { readdirSync as readdirSync2, readFileSync as readFileSync6 } from "fs";
+import { readdirSync as readdirSync2, readFileSync as readFileSync6, statSync } from "fs";
 import { join as join6 } from "path";
 var LEVEL_ORDER = { error: 0, warn: 1, info: 2, debug: 3 };
 var DAY_MS = 24 * 60 * 60 * 1e3;
@@ -30006,6 +30131,13 @@ var CliLogger = class {
     this.retentionDays = opts.retentionDays ?? DEFAULT_RETENTION_DAYS;
     void this.cleanupOldLogs();
   }
+  /** Update the retention window at runtime + prune now (ADR-0115). `days<=0` keeps current. */
+  setRetentionDays(days) {
+    if (days > 0) {
+      this.retentionDays = days;
+      void this.cleanupOldLogs();
+    }
+  }
   /** Log an error-level event. */
   error(event, fields) {
     this.write("error", event, fields);
@@ -30062,6 +30194,24 @@ function readRecentLogLines(dir2, limit) {
     return [];
   }
 }
+var LOG_UPLOAD_CONTENT_MAX = 512 * 1024;
+function readLogUpload(dir2) {
+  try {
+    const files = readdirSync2(dir2).filter((f) => /^cli-\d{4}-\d{2}-\d{2}\.jsonl$/.test(f)).sort();
+    const latest = files[files.length - 1];
+    if (!latest) return null;
+    let totalBytes = 0;
+    for (const f of files) totalBytes += statSync(join6(dir2, f)).size;
+    let content = readFileSync6(join6(dir2, latest), "utf8");
+    if (content.length > LOG_UPLOAD_CONTENT_MAX) {
+      content = `\u2026[truncated]
+${content.slice(-LOG_UPLOAD_CONTENT_MAX)}`;
+    }
+    return { fileName: latest, content, totalBytes };
+  } catch {
+    return null;
+  }
+}
 
 // src/core/update-scheduler.ts
 var TICK_MS = 6e4;
@@ -30320,7 +30470,7 @@ async function runAiFailover(plan, commandId, cwd2, handlers) {
         handlers.onChunk(text);
       }
     };
-    finalExit = await runAttempt(commandId, plan.cmd, plan.args, cwd2, attempt.env, emit);
+    finalExit = await runAttempt(commandId, plan.cmd, attempt.args, cwd2, attempt.env, emit);
     const tail = parser.flush();
     if (tail) {
       captured += tail;
@@ -30380,13 +30530,18 @@ function resolveHomePath(value) {
   if (isAbsolute(value)) return value;
   return join8(homedir3(), value);
 }
-function resolveDirs(value) {
-  if (!value) return [];
-  const list = Array.isArray(value) ? value : [value];
-  return list.filter((v) => v && v.trim()).map(resolveHomePath);
+function profileDirs(profiles) {
+  if (!profiles) return [];
+  return profiles.map((p) => p.profile).filter((v) => v && v.trim()).map(resolveHomePath);
+}
+function buildRunArgs(profile, cmd, prompt) {
+  const pre = profile.args ?? DEFAULT_AI_ARGS[cmd] ?? [];
+  const model = profile.model?.trim();
+  const modelArgs = model ? ["--model", model] : [];
+  return [...pre, ...modelArgs, prompt];
 }
-function claudeConfigDirs(config) {
-  const dirs = resolveDirs(config.claudeConfigDir);
+function claudeHomeDirs(config) {
+  const dirs = profileDirs(config.claudeHome);
   return dirs.length > 0 ? dirs : [join8(homedir3(), ".claude")];
 }
 function profileDisplayLabel(dir2) {
@@ -30403,28 +30558,40 @@ function profileEnvVar(cmd) {
   if (cmd.includes("codex")) return "CODEX_HOME";
   return null;
 }
+function profilesFor(config, cmd) {
+  const envVar = profileEnvVar(cmd);
+  if (envVar === "CLAUDE_CONFIG_DIR") return config.claudeHome ?? [];
+  if (envVar === "CODEX_HOME") return config.codexHome ?? [];
+  return [];
+}
 function profileLabels(config) {
   const cmd = config.aiCli ?? DEFAULT_AI_CLI;
-  const envVar = profileEnvVar(cmd);
-  const dirs = envVar === "CLAUDE_CONFIG_DIR" ? resolveDirs(config.claudeConfigDir) : envVar === "CODEX_HOME" ? resolveDirs(config.codexHome) : [];
-  return dirs.map((dir2) => profileDisplayLabel(dir2));
+  return profileDirs(profilesFor(config, cmd)).map((dir2) => profileDisplayLabel(dir2));
 }
 function planAiRun(prompt, config, workingDir) {
   const cmd = config.aiCli ?? DEFAULT_AI_CLI;
-  const args = [...config.aiArgs ?? DEFAULT_AI_ARGS[cmd] ?? [], prompt];
   const baseEnv = config.aiEnv ?? {};
   const envVar = profileEnvVar(cmd);
-  const dirs = envVar ? envVar === "CLAUDE_CONFIG_DIR" ? resolveDirs(config.claudeConfigDir) : resolveDirs(config.codexHome) : [];
-  if (!envVar || dirs.length === 0) {
-    return { cmd, args, attempts: [{ label: "default", dir: null, env: { ...baseEnv } }] };
-  }
-  const ordered = workingDir && dirs.includes(workingDir) ? [workingDir, ...dirs.filter((d) => d !== workingDir)] : dirs;
-  const attempts = ordered.map((dir2) => ({
+  const defaultPlan = {
+    cmd,
+    attempts: [
+      { label: "default", dir: null, args: buildRunArgs({ profile: "" }, cmd, prompt), env: { ...baseEnv } }
+    ]
+  };
+  if (!envVar) return defaultPlan;
+  const resolved = profilesFor(config, cmd).filter((p) => p.profile && p.profile.trim()).map((p) => ({ profile: p, dir: resolveHomePath(p.profile) }));
+  if (resolved.length === 0) return defaultPlan;
+  const ordered = workingDir && resolved.some((r) => r.dir === workingDir) ? [
+    resolved.find((r) => r.dir === workingDir),
+    ...resolved.filter((r) => r.dir !== workingDir)
+  ] : resolved;
+  const attempts = ordered.map(({ profile, dir: dir2 }) => ({
     label: profileDisplayLabel(dir2),
     dir: dir2,
+    args: buildRunArgs(profile, cmd, prompt),
     env: { ...baseEnv, [envVar]: dir2 }
   }));
-  return { cmd, args, attempts };
+  return { cmd, attempts };
 }
 
 // src/core/claude-usage.ts
@@ -30779,6 +30946,13 @@ function recordCommand(entry) {
 function getCommandHistory() {
   return entries;
 }
+function pruneCommandHistoryByAge(days) {
+  if (days <= 0) return;
+  const cutoff = Date.now() - days * 24 * 60 * 60 * 1e3;
+  const before = entries.length;
+  entries = entries.filter((e) => new Date(e.startedAt).getTime() >= cutoff);
+  if (entries.length !== before) persist();
+}
 function finishCommand(commandId, exitCode, usage) {
   const entry = entries.find((e) => e.commandId === commandId && e.status === "running");
   if (!entry) return;
@@ -30806,7 +30980,7 @@ import {
   readFileSync as readFileSync11,
   readdirSync as readdirSync3,
   rmSync as rmSync3,
-  statSync
+  statSync as statSync2
 } from "fs";
 import { join as join11 } from "path";
 var KEEP_FILES = 200;
@@ -30839,11 +31013,22 @@ function readCommandOutput(commandId) {
 function prune() {
   if (!dir) return;
   try {
-    const files = readdirSync3(dir).filter((f) => f.endsWith(".log")).map((f) => ({ f, t: statSync(join11(dir, f)).mtimeMs })).sort((a, b) => b.t - a.t);
+    const files = readdirSync3(dir).filter((f) => f.endsWith(".log")).map((f) => ({ f, t: statSync2(join11(dir, f)).mtimeMs })).sort((a, b) => b.t - a.t);
     for (const { f } of files.slice(KEEP_FILES)) rmSync3(join11(dir, f), { force: true });
   } catch {
   }
 }
+function pruneCommandOutputByAge(days) {
+  if (!dir || days <= 0) return;
+  const cutoff = Date.now() - days * 24 * 60 * 60 * 1e3;
+  try {
+    for (const f of readdirSync3(dir).filter((n) => n.endsWith(".log"))) {
+      const p = join11(dir, f);
+      if (statSync2(p).mtimeMs < cutoff) rmSync3(p, { force: true });
+    }
+  } catch {
+  }
+}
 
 // src/core/fs-browse.ts
 import { readdir as readdir2 } from "fs/promises";
@@ -31087,9 +31272,14 @@ function subDirName(repo) {
   const raw = (repo.subdir || repo.role || repo.name || "repo").trim();
   return raw.replace(/[^\w.-]+/g, "-").replace(/^-+|-+$/g, "") || "repo";
 }
-async function provisionRepos(target, repos, emit) {
+async function provisionRepos(target, repos, emit, opts = {}) {
   for (const repo of repos) {
     if (repo.primary) {
+      if (opts.clonePrimary && repo.op === "existing" && repo.url) {
+        emit("git", `Cloning ${repo.url}\u2026`);
+        await run6("git", ["clone", repo.url, target], { timeout: 12e4 });
+        continue;
+      }
       emit("git", "Initializing the primary repo\u2026");
       await run6("git", ["init"], { cwd: target, timeout: 2e4 });
       if (repo.op === "existing" && repo.url) {
@@ -31176,19 +31366,15 @@ async function generateFile(path, prompt) {
   } catch {
   }
 }
-async function addProject(payload, onProgress) {
+async function addProject(payload, profileDir2, onProgress) {
   const emit = (step, message) => onProgress?.({ projectId: payload.projectId, step, message });
   try {
-    const target = resolve5(payload.path);
+    const root = process.env.SCAFFOLD_ROOT ? resolve5(process.env.SCAFFOLD_ROOT) : resolve5(profileDir2);
+    const target = join12(root, payload.projectName);
     await mkdir2(target, { recursive: true });
-    if (payload.repoUrl) {
-      emit("clone", `Cloning ${payload.repoUrl}\u2026`);
-      await run6("git", ["clone", payload.repoUrl, target], { timeout: 12e4 });
-    } else {
-      emit("init", "git init\u2026");
-      await run6("git", ["init"], { cwd: target, timeout: 2e4 });
-    }
-    onProgress?.({ projectId: payload.projectId, step: "done", message: "Repo ready.", done: true });
+    const repos = payload.repos ?? [];
+    if (repos.length > 0) await provisionRepos(target, repos, emit, { clonePrimary: true });
+    onProgress?.({ projectId: payload.projectId, step: "done", message: "Project added.", done: true });
     return { ok: true, path: target };
   } catch (err) {
     return { ok: false, error: err instanceof Error ? err.message : String(err) };
@@ -31198,9 +31384,10 @@ async function addProject(payload, onProgress) {
 // src/core/ws-client.ts
 var HEARTBEAT_MS = 3e4;
 var USAGE_POLL_MS = 5 * 6e4;
+var LOG_UPLOAD_MS = 10 * 6e4;
 var RECONNECT_BACKOFF_BASE_MS = 1e3;
-var RECONNECT_MAX_BACKOFF_DEFAULT_SEC = 600;
-var RECONNECT_BACKOFF_MAX_ATTEMPT = 10;
+var RECONNECT_MAX_BACKOFF_DEFAULT_SEC = 60;
+var RECONNECT_BACKOFF_MAX_ATTEMPT = 6;
 function envReconnectMaxSec() {
   const raw = Number(process.env.FOURPM_RECONNECT_MAX_BACKOFF_SEC);
   if (!Number.isFinite(raw)) return null;
@@ -31225,10 +31412,17 @@ var WsClient = class {
   context;
   socket = null;
   sessionKey = null;
+  // True once the current connectOnce() reached hello_ack — a *real* session. Gates the
+  // backoff reset so a socket that opens then closes before the handshake keeps backing off
+  // instead of hammering the server every ~1s.
+  sessionEstablished = false;
   ecdh = null;
   wsToken = "";
   heartbeat = null;
   usageTimer = null;
+  logUploadTimer = null;
+  /** Signature (fileName + totalBytes) of the last log upload — skip re-sending if unchanged. */
+  lastLogSig = null;
   usageSnapshot = null;
   /** Whether the serving project requires outbound review before each AI spawn (ADR-0082). */
   outboundReviewEnabled = false;
@@ -31253,6 +31447,12 @@ var WsClient = class {
   connectWaiters = [];
   /** Output buffered while disconnected (flushed on reconnect). */
   offlineBuffer = [];
+  /**
+   * Command ids already accepted (insertion-ordered, bounded). WS delivery is at-least-once —
+   * a redelivered `COMMAND_DISPATCH` (reconnect/blip during a long AI run) must NOT run again:
+   * re-running an AI prompt would waste tokens and echo the prompt a second time in the console.
+   */
+  handledCommands = /* @__PURE__ */ new Set();
   offlineBufferBytes = 0;
   /** cli → server requests awaiting a reply (quota.check — ADR-0020). */
   pending = /* @__PURE__ */ new Map();
@@ -31301,12 +31501,20 @@ var WsClient = class {
   }
   /**
    * Resolve the reconnect-backoff cap (ms): the org value (from ws_token) over the
-   * env override over the default. Each is already clamped to the 10-min ceiling.
+   * env override over the default. Each is already clamped to the 1-min ceiling.
    */
   reconnectMaxMs() {
     const sec = this.orgReconnectMaxSec ?? this.envReconnectMaxSec ?? RECONNECT_MAX_BACKOFF_DEFAULT_SEC;
     return sec * 1e3;
   }
+  /** Mark a commandId as accepted for dedup, keeping the set bounded (drop the oldest). */
+  markCommandHandled(commandId) {
+    this.handledCommands.add(commandId);
+    if (this.handledCommands.size > 1e3) {
+      const oldest = this.handledCommands.values().next().value;
+      if (oldest !== void 0) this.handledCommands.delete(oldest);
+    }
+  }
   /** Backoff sleep that can be woken early by reconnectNow(). */
   interruptibleSleep(ms) {
     if (this.forceReconnect) {
@@ -31334,8 +31542,10 @@ var WsClient = class {
     for (let attempt = 0; !this.stopped; attempt++) {
       try {
         await this.connectOnce();
-        attempt = 0;
-        hashcodeInvalidStreak = 0;
+        if (this.sessionEstablished) {
+          attempt = 0;
+          hashcodeInvalidStreak = 0;
+        }
       } catch (err) {
         if (err instanceof CliApiError) {
           if (["HASHCODE_EXPIRED", "LINK_REVOKED"].includes(err.errorCode)) {
@@ -31378,6 +31588,7 @@ var WsClient = class {
   connectOnce() {
     return new Promise((resolve6, reject) => {
       void (async () => {
+        this.sessionEstablished = false;
         this.bus.setStatus("connecting");
         const token = await requestWsToken(this.credential.serverUrl, this.credential.hashcode3);
         this.wsToken = token.wsToken;
@@ -31391,6 +31602,11 @@ var WsClient = class {
             timezone: token.timezone
           });
         }
+        if (typeof token.cliRetentionDays === "number" && token.cliRetentionDays > 0) {
+          logger.setRetentionDays(token.cliRetentionDays);
+          pruneCommandHistoryByAge(token.cliRetentionDays);
+          pruneCommandOutputByAge(token.cliRetentionDays);
+        }
         writeProfileConfig(this.context.profileDir, {
           sessionSwitchPct: token.projectTokens?.sessionSwitchPct ?? 0,
           perPromptTokenLimit: token.projectTokens?.perPromptTokenLimit ?? 0
@@ -31404,7 +31620,12 @@ var WsClient = class {
         } else if (token.scope) {
           this.bus.setScope(token.scope);
         }
-        const wsUrl = this.credential.serverUrl.replace(/^http/, "ws") + "/ws";
+        if (token.wsUrl !== void 0 && token.wsUrl !== this.credential.wsUrl) {
+          this.credential.wsUrl = token.wsUrl || void 0;
+          writeCredential(this.context.profileDir, this.credential);
+        }
+        const wsBase = this.credential.wsUrl ?? this.credential.serverUrl;
+        const wsUrl = wsBase.replace(/^http/, "ws") + "/ws";
         const socket = new wrapper_default(wsUrl);
         this.socket = socket;
         socket.on("open", () => {
@@ -31450,6 +31671,7 @@ var WsClient = class {
     if ("type" in message) {
       if (message.type === "hello_ack" && this.ecdh) {
         this.sessionKey = deriveSessionKey(this.ecdh, message.pubkey);
+        this.sessionEstablished = true;
         if (message.workerName) this.bus.setWorker(message.workerName);
         if (message.projectName) {
           this.bus.setProject(message.projectName);
@@ -31466,6 +31688,7 @@ var WsClient = class {
         this.flushOfflineBuffer();
         this.startHeartbeat();
         this.startUsagePolling();
+        this.startLogUpload();
         this.connectWaiters.splice(0).forEach((fn) => fn());
         return;
       }
@@ -31542,6 +31765,11 @@ var WsClient = class {
       }
       case WsChannels.COMMAND_DISPATCH: {
         const dispatch = payload;
+        if (this.handledCommands.has(dispatch.commandId)) {
+          logger.info("command.dispatch.duplicate", { commandId: dispatch.commandId });
+          break;
+        }
+        this.markCommandHandled(dispatch.commandId);
         logger.info("command.dispatch", {
           commandId: dispatch.commandId,
           cmd: dispatch.cmd,
@@ -31635,6 +31863,11 @@ var WsClient = class {
         this.send(WsChannels.LOG_READ, { lines }, message.id);
         break;
       }
+      case WsChannels.COMMAND_OUTPUT_READ: {
+        const output = readCommandOutput(payload.commandId);
+        this.send(WsChannels.COMMAND_OUTPUT_READ, { output }, message.id);
+        break;
+      }
       case WsChannels.PROJECT_CREATE:
         void scaffoldProject(
           payload,
@@ -31645,6 +31878,7 @@ var WsClient = class {
       case WsChannels.PROJECT_ADD:
         void addProject(
           payload,
+          this.context.profileDir,
           (p) => this.send(WsChannels.PROJECT_PROGRESS, p)
         ).then((reply) => this.send(WsChannels.PROJECT_ADD, reply, message.id));
         break;
@@ -31736,17 +31970,18 @@ var WsClient = class {
       });
     }
     const plan = planAiRun(prompt, config, startDir ?? workingDir);
+    const markerArgs = plan.attempts[0]?.args ?? [];
     this.bus.push({ source: origin, kind: "aireq", text: `${plan.cmd} \u2039 ${prompt}` });
     logger.info("command.ai", { commandId, origin, cmd: plan.cmd, profiles: plan.attempts.length });
     if (origin === "local") {
       this.send(WsChannels.COMMAND_ANNOUNCE, {
         commandId,
         cmd: plan.cmd,
-        args: plan.args,
+        args: markerArgs,
         origin: "local"
       });
     }
-    recordCommand({ commandId, cmd: plan.cmd, args: plan.args });
+    recordCommand({ commandId, cmd: plan.cmd, args: markerArgs });
     const startedAt = (/* @__PURE__ */ new Date()).toISOString();
     this.bus.startBusy(plan.cmd);
     let seq = 0;
@@ -31811,7 +32046,7 @@ var WsClient = class {
     this.send(WsChannels.COMMAND_HISTORY, {
       commandId,
       cmd: plan.cmd,
-      args: plan.args,
+      args: markerArgs,
       status: result.exitCode === 0 ? "done" : "failed",
       exitCode: result.exitCode,
       tokens: result.usage.tokens,
@@ -31847,7 +32082,7 @@ var WsClient = class {
     if (threshold <= 0 || cmd !== "claude") return null;
     const util2 = this.usageSnapshot?.session.utilizationPct ?? 0;
     if (util2 < threshold) return null;
-    const dirs = claudeConfigDirs(config);
+    const dirs = claudeHomeDirs(config);
     if (dirs.length < 2) return null;
     const currentIndex = workingDir ? dirs.indexOf(workingDir) : -1;
     const next = dirs[(currentIndex + 1) % dirs.length];
@@ -32048,6 +32283,8 @@ var WsClient = class {
     this.heartbeat = null;
     if (this.usageTimer) clearInterval(this.usageTimer);
     this.usageTimer = null;
+    if (this.logUploadTimer) clearInterval(this.logUploadTimer);
+    this.logUploadTimer = null;
   }
   /**
    * Poll the Claude subscription usage API and push a `machine.usage` snapshot (ADR-0072).
@@ -32060,7 +32297,7 @@ var WsClient = class {
       const config = readProfileConfig(this.context.profileDir);
       const aiCli2 = config.aiCli ?? "claude";
       const working = getWorkingProfile(this.context.profileDir, aiCli2);
-      const configured = claudeConfigDirs(config);
+      const configured = claudeHomeDirs(config);
       const dirs = working ? [working, ...configured.filter((d) => d !== working)] : configured;
       const profile = working ? basename3(working) : dirs[0] ? basename3(dirs[0]) : "default";
       const api = await checkClaudeUsage(dirs, aiCli2);
@@ -32085,6 +32322,29 @@ var WsClient = class {
     this.usageTimer.unref?.();
     void this.pollUsage();
   }
+  /** Start the periodic upload of the cli's own JSONL log to the server (ADR-0122). */
+  startLogUpload() {
+    if (this.logUploadTimer) clearInterval(this.logUploadTimer);
+    this.logUploadTimer = setInterval(() => this.uploadLog(), LOG_UPLOAD_MS);
+    this.logUploadTimer.unref?.();
+    this.uploadLog();
+  }
+  /**
+   * Upload the newest cli log file + the total log footprint to the server (ADR-0122), so it is
+   * stored + retained server-side and counted in the machine user's storage. Skips when nothing
+   * changed since the last upload. Best-effort — never disrupts the session.
+   */
+  uploadLog() {
+    try {
+      const upload = readLogUpload(join13(this.context.profileDir, "logs"));
+      if (!upload) return;
+      const sig = `${upload.fileName}:${upload.totalBytes}`;
+      if (sig === this.lastLogSig) return;
+      this.lastLogSig = sig;
+      this.send(WsChannels.MACHINE_LOG, upload);
+    } catch {
+    }
+  }
   /**
    * Logout: close WS, delete `.cre`, and prompt to pair again (Unlinked state).
    */
@@ -38258,9 +38518,9 @@ import { existsSync as existsSync10 } from "fs";
 import { join as join16 } from "path";
 var CONFIG_KEYS = [
   "aiCli",
-  "aiArgs",
-  "claudeConfigDir",
+  "claudeHome",
   "codexHome",
+  "antigravityHome",
   "physicPath",
   "commandHistoryUploadMinutes",
   "autoUpdate",
@@ -38276,14 +38536,13 @@ function parseConfigAssignment(key, valueTokens) {
     case "physicPath":
       if (!value) return { error: `Missing value for "${key}".` };
       return { patch: { [key]: value } };
-    case "claudeConfigDir":
-    case "codexHome": {
+    case "claudeHome":
+    case "codexHome":
+    case "antigravityHome": {
       const dirs = valueTokens.filter((t) => t.trim());
       if (dirs.length === 0) return { error: `Missing value for "${key}".` };
-      return { patch: { [key]: dirs.length === 1 ? dirs[0] : dirs } };
+      return { patch: { [key]: dirs.map((profile) => ({ profile, model: "" })) } };
     }
-    case "aiArgs":
-      return { patch: { aiArgs: valueTokens } };
     case "commandHistoryUploadMinutes": {
       const n = Number(value);
       if (!Number.isFinite(n) || n <= 0) return { error: `"${value}" is not a positive number.` };
@@ -38313,22 +38572,19 @@ function runConfig(ctx) {
     return;
   }
   if (sub === "init") {
+    const writeDefaults = (verb) => {
+      overwriteProfileConfig(dir2, defaultProfileConfig());
+      ctx.print(`\u2714 ${verb} default config: ${path}`);
+      ctx.print("add claude profiles: /config set claudeHome .claude .claude-1 (tried in order)");
+    };
     if (existsSync10(path)) {
-      ctx.print(`config already exists: ${path} (use /config set <key> <value>)`, "warn");
+      ctx.confirm(
+        `config exists: ${path} \u2014 replace it with defaults? (y/N)`,
+        () => writeDefaults("replaced with")
+      );
       return;
     }
-    const defaults = {
-      aiCli: "claude",
-      aiArgs: ["-p"],
-      // Lists so failover across profiles is discoverable (ADR-0057) — add more dirs.
-      claudeConfigDir: [".claude"],
-      codexHome: [".codex"],
-      autoUpdate: true,
-      commandHistoryUploadMinutes: 10
-    };
-    writeProfileConfig(dir2, defaults);
-    ctx.print(`\u2714 wrote default config: ${path}`);
-    ctx.print("add claude profiles: /config set claudeConfigDir .claude .claude-1 (tried in order)");
+    writeDefaults("wrote");
     return;
   }
   if (sub === "set") {
@@ -38729,6 +38985,7 @@ function App2({
   const [expanded, setExpanded] = (0, import_react26.useState)(() => /* @__PURE__ */ new Set());
   const [history, setHistory] = (0, import_react26.useState)(() => loadInputHistory(info.profileDir));
   const [startedAt] = (0, import_react26.useState)(() => Date.now());
+  const [pendingConfirm, setPendingConfirm] = (0, import_react26.useState)(null);
   (0, import_react26.useEffect)(() => {
     const offTranscript = bus.onTranscript((entry) => {
       setEntries(
@@ -38785,8 +39042,16 @@ function App2({
   };
   const handleSubmit = (input) => {
     setScrollBack(0);
-    setHistory((prev) => appendInputHistory(info.profileDir, input, prev));
     const trimmed = input.trim();
+    if (pendingConfirm) {
+      const { onYes } = pendingConfirm;
+      setPendingConfirm(null);
+      bus.push({ source: "local", kind: "cmd", text: trimmed });
+      if (/^y(es)?$/i.test(trimmed)) onYes();
+      else bus.push({ source: "local", kind: "log", text: "cancelled." });
+      return;
+    }
+    setHistory((prev) => appendInputHistory(info.profileDir, input, prev));
     if (trimmed.startsWith("/")) {
       bus.push({ source: "local", kind: "cmd", text: trimmed });
       runSlashCommand(trimmed, {
@@ -38798,6 +39063,10 @@ function App2({
           stdout.write("\x1B[2J\x1B[3J\x1B[H");
         },
         quit: () => exit(),
+        confirm: (prompt, onYes) => {
+          bus.push({ source: "local", kind: "log", text: prompt });
+          setPendingConfirm({ prompt, onYes });
+        },
         submitAi: (aiInput) => bus.submitLocal(aiInput),
         reconnect: () => bus.requestReconnect(),
         expand: expandFold,
@@ -38869,6 +39138,7 @@ async function runStart(profileDir2, profileName) {
     base: { version: CLI_VERSION, profile: profileName, scope: credential.scope }
   });
   logger.info("cli.start", { serverUrl: credential.serverUrl });
+  ensureProfileConfig(profileDir2);
   const config = readProfileConfig(profileDir2);
   const autoUpdate = config.autoUpdate !== false && process.env.FOURPM_NO_UPDATE !== "1";
   const result = await checkAndUpdate(credential.serverUrl, autoUpdate);

package/package.json

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