pubblue 0.6.4 → 0.6.8

package/dist/index.js

@@ -27,7 +27,7 @@ import {
   toCliFailure,
   waitForDaemonReady,
   writeLatestCliVersion
-} from "./chunk-JXEXE632.js";
+} from "./chunk-AZQD654L.js";
 
 // src/program.ts
 import { Command } from "commander";
@@ -189,103 +189,78 @@ function parsePositiveInteger(raw, key) {
   }
   return parsed;
 }
-var SUPPORTED_KEYS = [
-  "openclaw.path",
-  "openclaw.sessionId",
-  "openclaw.threadId",
-  "openclaw.canvasReminderEvery",
-  "openclaw.deliver",
-  "openclaw.deliverChannel",
-  "openclaw.replyTo",
-  "openclaw.deliverTimeoutMs",
-  "openclaw.attachmentDir",
-  "openclaw.attachmentMaxBytes",
-  "telegram.botToken"
-];
+var CONFIG_KEY_REGISTRY = {
+  "openclaw.path": { target: "bridge", field: "openclawPath", type: "string" },
+  "openclaw.stateDir": { target: "bridge", field: "openclawStateDir", type: "string" },
+  "openclaw.sessionId": { target: "bridge", field: "sessionId", type: "string" },
+  "openclaw.threadId": { target: "bridge", field: "threadId", type: "string" },
+  "openclaw.canvasReminderEvery": {
+    target: "bridge",
+    field: "canvasReminderEvery",
+    type: "integer"
+  },
+  "openclaw.deliver": { target: "bridge", field: "deliver", type: "boolean" },
+  "openclaw.deliverChannel": { target: "bridge", field: "deliverChannel", type: "string" },
+  "openclaw.replyTo": { target: "bridge", field: "replyTo", type: "string" },
+  "openclaw.deliverTimeoutMs": { target: "bridge", field: "deliverTimeoutMs", type: "integer" },
+  "openclaw.attachmentDir": { target: "bridge", field: "attachmentDir", type: "string" },
+  "openclaw.attachmentMaxBytes": { target: "bridge", field: "attachmentMaxBytes", type: "integer" },
+  "claude-code.path": { target: "bridge", field: "claudeCodePath", type: "string" },
+  "claude-code.model": { target: "bridge", field: "claudeCodeModel", type: "string" },
+  "claude-code.allowedTools": { target: "bridge", field: "claudeCodeAllowedTools", type: "string" },
+  "claude-code.appendSystemPrompt": {
+    target: "bridge",
+    field: "claudeCodeAppendSystemPrompt",
+    type: "string",
+    displayAs: "set-only"
+  },
+  "claude-code.maxTurns": { target: "bridge", field: "claudeCodeMaxTurns", type: "integer" },
+  "claude-code.cwd": { target: "bridge", field: "claudeCodeCwd", type: "string" },
+  "telegram.botToken": {
+    target: "telegram",
+    field: "botToken",
+    type: "string",
+    cascadeUnset: ["botUsername", "hasMainWebApp"]
+  }
+};
+var SUPPORTED_KEYS = Object.keys(CONFIG_KEY_REGISTRY);
+function coerceValue(raw, type, key) {
+  if (type === "integer") return parsePositiveInteger(raw, key);
+  if (type === "boolean") return parseBooleanValue(raw, key);
+  return raw;
+}
 function applyConfigSet(bridge, telegram, key, value) {
-  switch (key) {
-    case "openclaw.path":
-      bridge.openclawPath = value;
-      return;
-    case "openclaw.sessionId":
-      bridge.sessionId = value;
-      return;
-    case "openclaw.threadId":
-      bridge.threadId = value;
-      return;
-    case "openclaw.canvasReminderEvery":
-      bridge.canvasReminderEvery = parsePositiveInteger(value, key);
-      return;
-    case "openclaw.deliver":
-      bridge.deliver = parseBooleanValue(value, key);
-      return;
-    case "openclaw.deliverChannel":
-      bridge.deliverChannel = value;
-      return;
-    case "openclaw.replyTo":
-      bridge.replyTo = value;
-      return;
-    case "openclaw.deliverTimeoutMs":
-      bridge.deliverTimeoutMs = parsePositiveInteger(value, key);
-      return;
-    case "openclaw.attachmentDir":
-      bridge.attachmentDir = value;
-      return;
-    case "openclaw.attachmentMaxBytes":
-      bridge.attachmentMaxBytes = parsePositiveInteger(value, key);
-      return;
-    case "telegram.botToken":
-      telegram.botToken = value;
-      return;
-    default:
-      throw new Error(
-        [
-          `Unknown config key: ${key}`,
-          "Supported keys:",
-          ...SUPPORTED_KEYS.map((k) => `  ${k}`)
-        ].join("\n")
-      );
+  const def = CONFIG_KEY_REGISTRY[key];
+  if (!def) {
+    throw new Error(
+      [
+        `Unknown config key: ${key}`,
+        "Supported keys:",
+        ...SUPPORTED_KEYS.map((k) => `  ${k}`)
+      ].join("\n")
+    );
+  }
+  const coerced = coerceValue(value, def.type, key);
+  if (def.target === "bridge") {
+    Object.assign(bridge, { [def.field]: coerced });
+  } else {
+    Object.assign(telegram, { [def.field]: coerced });
   }
 }
 function applyConfigUnset(bridge, telegram, key) {
-  switch (key) {
-    case "openclaw.path":
-      delete bridge.openclawPath;
-      return;
-    case "openclaw.sessionId":
-      delete bridge.sessionId;
-      return;
-    case "openclaw.threadId":
-      delete bridge.threadId;
-      return;
-    case "openclaw.canvasReminderEvery":
-      delete bridge.canvasReminderEvery;
-      return;
-    case "openclaw.deliver":
-      delete bridge.deliver;
-      return;
-    case "openclaw.deliverChannel":
-      delete bridge.deliverChannel;
-      return;
-    case "openclaw.replyTo":
-      delete bridge.replyTo;
-      return;
-    case "openclaw.deliverTimeoutMs":
-      delete bridge.deliverTimeoutMs;
-      return;
-    case "openclaw.attachmentDir":
-      delete bridge.attachmentDir;
-      return;
-    case "openclaw.attachmentMaxBytes":
-      delete bridge.attachmentMaxBytes;
-      return;
-    case "telegram.botToken":
-      delete telegram.botToken;
-      delete telegram.botUsername;
-      delete telegram.hasMainWebApp;
-      return;
-    default:
-      throw new Error(`Unknown config key for --unset: ${key}`);
+  const def = CONFIG_KEY_REGISTRY[key];
+  if (!def) {
+    throw new Error(`Unknown config key for --unset: ${key}`);
+  }
+  if (def.target === "bridge") {
+    delete bridge[def.field];
+  } else {
+    delete telegram[def.field];
+    if (def.cascadeUnset) {
+      for (const cascadeField of def.cascadeUnset) {
+        delete telegram[cascadeField];
+      }
+    }
   }
 }
 function hasValues(obj) {
@@ -317,41 +292,32 @@ async function telegramSetMenuButton(token, button) {
     throw new Error(data.description ?? "setChatMenuButton failed");
   }
 }
-function printConfigSummary(saved) {
-  if (!saved) {
-    console.log("Saved config: none");
+function formatFieldValue(value, def) {
+  if (def.displayAs === "set-only") return "(set)";
+  if (def.type === "boolean") return value ? "true" : "false";
+  return String(value);
+}
+function printBridgeConfig(bridge) {
+  if (!hasValues(bridge)) {
+    console.log("  bridge: none");
     return;
   }
-  console.log("Saved config:");
-  console.log(`  apiKey: ${maskSecret(saved.apiKey)}`);
-  if (saved.bridge && hasValues(saved.bridge)) {
-    if (saved.bridge.openclawPath) console.log(`  openclaw.path: ${saved.bridge.openclawPath}`);
-    if (saved.bridge.sessionId) console.log(`  openclaw.sessionId: ${saved.bridge.sessionId}`);
-    if (saved.bridge.threadId) console.log(`  openclaw.threadId: ${saved.bridge.threadId}`);
-    if (saved.bridge.canvasReminderEvery !== void 0)
-      console.log(`  openclaw.canvasReminderEvery: ${saved.bridge.canvasReminderEvery}`);
-    if (saved.bridge.deliver !== void 0)
-      console.log(`  openclaw.deliver: ${saved.bridge.deliver ? "true" : "false"}`);
-    if (saved.bridge.deliverChannel)
-      console.log(`  openclaw.deliverChannel: ${saved.bridge.deliverChannel}`);
-    if (saved.bridge.replyTo) console.log(`  openclaw.replyTo: ${saved.bridge.replyTo}`);
-    if (saved.bridge.deliverTimeoutMs !== void 0)
-      console.log(`  openclaw.deliverTimeoutMs: ${saved.bridge.deliverTimeoutMs}`);
-    if (saved.bridge.attachmentDir)
-      console.log(`  openclaw.attachmentDir: ${saved.bridge.attachmentDir}`);
-    if (saved.bridge.attachmentMaxBytes !== void 0)
-      console.log(`  openclaw.attachmentMaxBytes: ${saved.bridge.attachmentMaxBytes}`);
-  } else {
-    console.log("  bridge: none");
+  for (const [key, def] of Object.entries(CONFIG_KEY_REGISTRY)) {
+    if (def.target !== "bridge") continue;
+    const value = bridge[def.field];
+    if (value === void 0) continue;
+    console.log(`  ${key}: ${formatFieldValue(value, def)}`);
   }
-  if (saved.telegram?.botToken && saved.telegram.botUsername) {
-    console.log(`  telegram.botToken: ${maskSecret(saved.telegram.botToken)}`);
-    console.log(`  telegram.botUsername: @${saved.telegram.botUsername}`);
-    if (!saved.telegram.hasMainWebApp) {
+}
+function printTelegramConfig(telegram) {
+  if (telegram?.botToken && telegram.botUsername) {
+    console.log(`  telegram.botToken: ${maskSecret(telegram.botToken)}`);
+    console.log(`  telegram.botUsername: @${telegram.botUsername}`);
+    if (!telegram.hasMainWebApp) {
       console.log("    INFO: Register Mini App in @BotFather for deep links to open in Telegram");
     }
-  } else if (saved.telegram?.botToken) {
-    console.log(`  telegram.botToken: ${maskSecret(saved.telegram.botToken)}`);
+  } else if (telegram?.botToken) {
+    console.log(`  telegram.botToken: ${maskSecret(telegram.botToken)}`);
     console.log("  telegram.botUsername: (not resolved)");
   } else {
     console.log("  telegram: not configured");
@@ -359,6 +325,16 @@ function printConfigSummary(saved) {
     console.log("    Example: pubblue configure --set telegram.botToken=<BOT_TOKEN>");
   }
 }
+function printConfigSummary(saved) {
+  if (!saved) {
+    console.log("Saved config: none");
+    return;
+  }
+  console.log("Saved config:");
+  console.log(`  apiKey: ${maskSecret(saved.apiKey)}`);
+  printBridgeConfig(saved.bridge ?? {});
+  printTelegramConfig(saved.telegram);
+}
 function registerConfigureCommand(program2) {
   program2.command("configure").description("Configure the CLI with your API key").option("--api-key <key>", "Your API key (less secure: appears in shell history)").option("--api-key-stdin", "Read API key from stdin").option(
     "--set <key=value>",
@@ -451,8 +427,8 @@ import * as path3 from "path";
 // package.json
 var package_default = {
   name: "pubblue",
-  version: "0.6.4",
-  description: "CLI tool for publishing content and running interactive sessions via pub.blue",
+  version: "0.6.8",
+  description: "CLI tool for publishing content and running live sessions via pub.blue",
   type: "module",
   bin: {
     pubblue: "./dist/index.js"
@@ -511,35 +487,16 @@ function registerLiveCommands(program2) {
   registerDoctorCommand(program2);
 }
 function registerStartCommand(program2) {
-  program2.command("start").description("Start the agent daemon (registers presence, awaits live requests)").requiredOption("--agent-name <name>", "Agent display name shown to the browser user").option("--bridge <mode>", "Bridge mode: openclaw|none").option("--foreground", "Run in foreground (don't fork)").action(async (opts) => {
+  program2.command("start").description("Start the agent daemon (registers presence, awaits live requests)").requiredOption("--agent-name <name>", "Agent display name shown to the browser user").option("--bridge <mode>", "Bridge mode: openclaw|claude-code").action(async (opts) => {
     await ensureNodeDatachannelAvailable();
     writeLatestCliVersion(CLI_VERSION);
     const runtimeConfig = getConfig();
-    const apiClient = createClient(runtimeConfig);
     const bridgeMode = resolveBridgeMode(opts);
     const bridgeProcessEnv = buildBridgeProcessEnv(runtimeConfig.bridge);
     const socketPath = getAgentSocketPath();
     const infoPath = liveInfoPath("agent");
     const logPath = liveLogPath("agent");
     await stopOtherDaemons();
-    if (opts.foreground) {
-      const { startDaemon } = await import("./live-daemon-EEIBVVBU.js");
-      console.log("Agent daemon starting in foreground...");
-      console.log("Press Ctrl+C to stop.");
-      try {
-        await startDaemon({
-          cliVersion: CLI_VERSION,
-          apiClient,
-          socketPath,
-          infoPath,
-          bridgeMode,
-          agentName: opts.agentName
-        });
-      } catch (error) {
-        failCli(`Daemon failed: ${errorMessage(error)}`);
-      }
-      return;
-    }
     const { fork } = await import("child_process");
     const daemonScript = path3.join(import.meta.dirname, "live-daemon-entry.js");
     const daemonLogFd = fs3.openSync(logPath, "a");
@@ -624,7 +581,8 @@ function registerStatusCommand(program2) {
     }
     const bridge = response.bridge;
     if (bridge) {
-      console.log(`  Bridge: openclaw (${bridge.running ? "running" : "stopped"})`);
+      const bridgeLabel = response.bridgeMode ?? "unknown";
+      console.log(`  Bridge: ${bridgeLabel} (${bridge.running ? "running" : "stopped"})`);
       if (bridge.sessionId) {
         console.log(`  Bridge session: ${bridge.sessionId}`);
       }