@pushary/agent-hooks 0.89.3 → 0.89.5

package/dist/bin/pushary-logout.js

@@ -4,25 +4,23 @@ import {
   codexConfigToml,
   cursorUserMcp,
   geminiSettings
-} from "../chunk-VKVHY5HD.js";
-import "../chunk-GIRT7677.js";
+} from "../chunk-V37ZXMH3.js";
 import {
   createIo
 } from "../chunk-5RUIFDTP.js";
 import {
   clearKey,
   readKeySource
-} from "../chunk-LALHWDWL.js";
+} from "../chunk-L3YUHEB6.js";
 import {
   parseFlags
 } from "../chunk-GMXKITVA.js";
 import {
   exitOnHelpFlag
-} from "../chunk-SQOFGPNX.js";
-import "../chunk-GOEXZ5QJ.js";
+} from "../chunk-LURY4WNF.js";
+import "../chunk-3XTFX4CL.js";
 import "../chunk-BC3VCZ3E.js";
 import "../chunk-DINDL2CF.js";
-import "../chunk-6MTNS63X.js";
 import "../chunk-OFRNZWC4.js";
 import {
   UsageError
@@ -30,6 +28,7 @@ import {
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
+import "../chunk-6MTNS63X.js";
 import {
   getBaseUrl
 } from "../chunk-2UMNXADU.js";

package/dist/bin/pushary-mode.js

@@ -11,8 +11,8 @@ import {
 } from "../chunk-GMXKITVA.js";
 import {
   exitOnHelpFlag
-} from "../chunk-SQOFGPNX.js";
-import "../chunk-GOEXZ5QJ.js";
+} from "../chunk-LURY4WNF.js";
+import "../chunk-3XTFX4CL.js";
 import "../chunk-DINDL2CF.js";
 import "../chunk-SAF6HGAA.js";
 import {

package/dist/bin/pushary-notification-hook.js

@@ -4,15 +4,17 @@ import {
 } from "../chunk-6CUUA7HO.js";
 import {
   handleNotification
-} from "../chunk-3UBYTSCY.js";
-import "../chunk-HUJAAWNL.js";
-import "../chunk-LGXTBUT4.js";
-import "../chunk-RN3NOEJF.js";
+} from "../chunk-NFI2K2ZQ.js";
+import "../chunk-GKAKAOKC.js";
+import "../chunk-KOPUTJQC.js";
+import "../chunk-2HYPZLYY.js";
+import "../chunk-V37ZXMH3.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
 import "../chunk-OFRNZWC4.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
+import "../chunk-6MTNS63X.js";
 import "../chunk-2UMNXADU.js";
 import "../chunk-L4C2JXJS.js";
 

package/dist/bin/pushary-opencode-hook.js

@@ -19,7 +19,7 @@ import {
   policyRequestFor,
   readLastPrompt,
   repoKeyFor
-} from "../chunk-3UBYTSCY.js";
+} from "../chunk-NFI2K2ZQ.js";
 import {
   DEFAULT_SESSION,
   askUser,
@@ -27,23 +27,26 @@ import {
   savePendingQuestion,
   sendNotification,
   waitForAnswer
-} from "../chunk-HUJAAWNL.js";
+} from "../chunk-GKAKAOKC.js";
 import {
+  HOOK_FALLBACK_MAX,
   OPENCODE_TOOL_NAMES,
   deriveActionBody,
   deriveBlocker,
   deriveToolTarget,
   describeToolCall,
   scopePathFor
-} from "../chunk-LGXTBUT4.js";
+} from "../chunk-KOPUTJQC.js";
 import {
   getMachineId
-} from "../chunk-RN3NOEJF.js";
+} from "../chunk-2HYPZLYY.js";
+import "../chunk-V37ZXMH3.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
 import "../chunk-OFRNZWC4.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
+import "../chunk-6MTNS63X.js";
 import {
   getApiKey
 } from "../chunk-2UMNXADU.js";
@@ -55,6 +58,7 @@ import {
   gateOutputFor,
   hookWaitClamped,
   hookWaitDeadline,
+  redactSecrets,
   resolveGate
 } from "../chunk-L4C2JXJS.js";
 
@@ -108,9 +112,13 @@ var pollForAnswer = async (apiKey, correlationId, deadlineMs, pollInterval = 2e3
   return { answered: false };
 };
 var agentNameFor = (input) => `${OPENCODE_AGENT.label} - ${basename(input.cwd ?? process.cwd())}`;
+var describeFor = (input, lookup) => {
+  if (lookup.tool) return describeToolCall(lookup.tool, lookup.input, "hook");
+  return redactSecrets(input.title ?? "").trim().slice(0, HOOK_FALLBACK_MAX) || "this request";
+};
 var pushQuestion = async (apiKey, input, lookup, waitSeconds, mode, pollInterval = 2e3) => {
   const projectName = basename(input.cwd ?? process.cwd());
-  const description = describeToolCall(lookup.tool, lookup.input, "hook");
+  const description = describeFor(input, lookup);
   const result = await askUser(apiKey, {
     question: `Allow ${description}?`,
     type: "confirm",
@@ -147,7 +155,7 @@ var notifyApprovalNeeded = async (apiKey, input, lookup) => {
   try {
     await sendNotification(apiKey, {
       title: "Agent needs approval",
-      body: describeToolCall(lookup.tool, lookup.input, "hook"),
+      body: describeFor(input, lookup),
       agentName: agentNameFor(input),
       sessionId: input.session_id,
       machineId: getMachineId()

package/dist/bin/pushary-permission-denied-hook.js

@@ -1,22 +1,24 @@
 #!/usr/bin/env node
 import {
   handlePermissionDenied
-} from "../chunk-JT6TIBYH.js";
+} from "../chunk-MZBT2LXW.js";
 import "../chunk-ATBKJNWS.js";
 import "../chunk-VZKXBFUA.js";
 import {
   readHookInput
 } from "../chunk-6CUUA7HO.js";
 import "../chunk-YHG74UFF.js";
-import "../chunk-3UBYTSCY.js";
-import "../chunk-HUJAAWNL.js";
-import "../chunk-LGXTBUT4.js";
-import "../chunk-RN3NOEJF.js";
+import "../chunk-NFI2K2ZQ.js";
+import "../chunk-GKAKAOKC.js";
+import "../chunk-KOPUTJQC.js";
+import "../chunk-2HYPZLYY.js";
+import "../chunk-V37ZXMH3.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
 import "../chunk-OFRNZWC4.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
+import "../chunk-6MTNS63X.js";
 import "../chunk-2UMNXADU.js";
 import "../chunk-L4C2JXJS.js";
 

package/dist/bin/pushary-permission-hook.js

@@ -1,22 +1,24 @@
 #!/usr/bin/env node
 import {
   handlePermissionRequest
-} from "../chunk-JT6TIBYH.js";
+} from "../chunk-MZBT2LXW.js";
 import "../chunk-ATBKJNWS.js";
 import "../chunk-VZKXBFUA.js";
 import {
   readHookInput
 } from "../chunk-6CUUA7HO.js";
 import "../chunk-YHG74UFF.js";
-import "../chunk-3UBYTSCY.js";
-import "../chunk-HUJAAWNL.js";
-import "../chunk-LGXTBUT4.js";
-import "../chunk-RN3NOEJF.js";
+import "../chunk-NFI2K2ZQ.js";
+import "../chunk-GKAKAOKC.js";
+import "../chunk-KOPUTJQC.js";
+import "../chunk-2HYPZLYY.js";
+import "../chunk-V37ZXMH3.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
 import "../chunk-OFRNZWC4.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
+import "../chunk-6MTNS63X.js";
 import "../chunk-2UMNXADU.js";
 import "../chunk-L4C2JXJS.js";
 

package/dist/bin/pushary-post-hook.js

@@ -4,15 +4,17 @@ import {
 } from "../chunk-6CUUA7HO.js";
 import {
   handlePostToolUse
-} from "../chunk-3UBYTSCY.js";
-import "../chunk-HUJAAWNL.js";
-import "../chunk-LGXTBUT4.js";
-import "../chunk-RN3NOEJF.js";
+} from "../chunk-NFI2K2ZQ.js";
+import "../chunk-GKAKAOKC.js";
+import "../chunk-KOPUTJQC.js";
+import "../chunk-2HYPZLYY.js";
+import "../chunk-V37ZXMH3.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
 import "../chunk-OFRNZWC4.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
+import "../chunk-6MTNS63X.js";
 import "../chunk-2UMNXADU.js";
 import "../chunk-L4C2JXJS.js";
 

package/dist/bin/pushary-prompt-hook.js

@@ -4,15 +4,17 @@ import {
 } from "../chunk-6CUUA7HO.js";
 import {
   handleUserPrompt
-} from "../chunk-3UBYTSCY.js";
-import "../chunk-HUJAAWNL.js";
-import "../chunk-LGXTBUT4.js";
-import "../chunk-RN3NOEJF.js";
+} from "../chunk-NFI2K2ZQ.js";
+import "../chunk-GKAKAOKC.js";
+import "../chunk-KOPUTJQC.js";
+import "../chunk-2HYPZLYY.js";
+import "../chunk-V37ZXMH3.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
 import "../chunk-OFRNZWC4.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
+import "../chunk-6MTNS63X.js";
 import "../chunk-2UMNXADU.js";
 import "../chunk-L4C2JXJS.js";
 

package/dist/bin/pushary-session-end-hook.js

@@ -4,15 +4,17 @@ import {
 } from "../chunk-6CUUA7HO.js";
 import {
   handleSessionEnd
-} from "../chunk-3UBYTSCY.js";
-import "../chunk-HUJAAWNL.js";
-import "../chunk-LGXTBUT4.js";
-import "../chunk-RN3NOEJF.js";
+} from "../chunk-NFI2K2ZQ.js";
+import "../chunk-GKAKAOKC.js";
+import "../chunk-KOPUTJQC.js";
+import "../chunk-2HYPZLYY.js";
+import "../chunk-V37ZXMH3.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
 import "../chunk-OFRNZWC4.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
+import "../chunk-6MTNS63X.js";
 import "../chunk-2UMNXADU.js";
 import "../chunk-L4C2JXJS.js";
 

package/dist/bin/pushary-session-start-hook.js

@@ -4,15 +4,17 @@ import {
 } from "../chunk-6CUUA7HO.js";
 import {
   handleSessionStart
-} from "../chunk-3UBYTSCY.js";
-import "../chunk-HUJAAWNL.js";
-import "../chunk-LGXTBUT4.js";
-import "../chunk-RN3NOEJF.js";
+} from "../chunk-NFI2K2ZQ.js";
+import "../chunk-GKAKAOKC.js";
+import "../chunk-KOPUTJQC.js";
+import "../chunk-2HYPZLYY.js";
+import "../chunk-V37ZXMH3.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
 import "../chunk-OFRNZWC4.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
+import "../chunk-6MTNS63X.js";
 import "../chunk-2UMNXADU.js";
 import "../chunk-L4C2JXJS.js";
 

package/dist/bin/pushary-setup.js

@@ -6,13 +6,10 @@ import {
   claudeWired,
   codexWired,
   geminiWired
-} from "../chunk-3O2XPYLF.js";
+} from "../chunk-OBI4YMCT.js";
 import {
   runBrowserLogin
 } from "../chunk-Z3Z4VK5F.js";
-import {
-  ensureDaemonRunning
-} from "../chunk-K42SZKYF.js";
 import {
   describeDetection,
   detectAllAgents,
@@ -24,7 +21,7 @@ import {
   shortenHome,
   vscodeSettingsTargets,
   writeInstructionBlock
-} from "../chunk-LUCFN47K.js";
+} from "../chunk-QH4AA7QV.js";
 import {
   OPENCODE_HOOK_BINARY,
   addOpenCodeMcpServer,
@@ -52,6 +49,19 @@ import {
   guardNodeScript,
   guardedArgv
 } from "../chunk-AIGDBRIJ.js";
+import {
+  daemonServiceManagerAvailable,
+  disableDaemonService,
+  ensureDaemonRunning,
+  hasDaemonServiceDefinition,
+  readDaemonStatus,
+  replaceDaemonService
+} from "../chunk-TRQ46MXR.js";
+import {
+  detectProviderLiveCapabilities,
+  hasSpawnProvider,
+  resolveControlPolicy
+} from "../chunk-NKHEHEUM.js";
 import "../chunk-XHKBHWLX.js";
 import {
   installGlobally,
@@ -59,6 +69,12 @@ import {
   resolveGlobalBinDir,
   resolveGlobalBinary
 } from "../chunk-PZA7G4CN.js";
+import {
+  reportEvent
+} from "../chunk-NFI2K2ZQ.js";
+import "../chunk-GKAKAOKC.js";
+import "../chunk-KOPUTJQC.js";
+import "../chunk-2HYPZLYY.js";
 import {
   addCodexHookTrust,
   addCodexHooks,
@@ -78,14 +94,7 @@ import {
   geminiSettings,
   pusharyConfigFile,
   vscodePluginDir
-} from "../chunk-VKVHY5HD.js";
-import "../chunk-GIRT7677.js";
-import {
-  reportEvent
-} from "../chunk-3UBYTSCY.js";
-import "../chunk-HUJAAWNL.js";
-import "../chunk-LGXTBUT4.js";
-import "../chunk-RN3NOEJF.js";
+} from "../chunk-V37ZXMH3.js";
 import {
   confirmAppConnection,
   connectDevice,
@@ -108,15 +117,16 @@ import {
   exportLine,
   keyPrefix,
   readConfigFileKey,
+  readControlMode,
   readKeySource,
   writeKey
-} from "../chunk-LALHWDWL.js";
+} from "../chunk-L3YUHEB6.js";
 import {
   parseFlags
 } from "../chunk-GMXKITVA.js";
 import {
   renderCommandHelp
-} from "../chunk-GOEXZ5QJ.js";
+} from "../chunk-3XTFX4CL.js";
 import {
   installClaudeAlias,
   resolveShellRc
@@ -125,12 +135,6 @@ import {
   getPackageVersion,
   isNewerVersion
 } from "../chunk-DINDL2CF.js";
-import {
-  backupFile,
-  readJsonSafe,
-  writeFileAtomic,
-  writeJsonAtomic
-} from "../chunk-6MTNS63X.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
 import "../chunk-OFRNZWC4.js";
@@ -140,6 +144,12 @@ import {
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
+import {
+  backupFile,
+  readJsonSafe,
+  writeFileAtomic,
+  writeJsonAtomic
+} from "../chunk-6MTNS63X.js";
 import "../chunk-2UMNXADU.js";
 import {
   CURSOR_GATE_EVENTS,
@@ -204,6 +214,18 @@ var describeClosing = (facts) => {
       exitCode: EXIT.PROBLEMS_FOUND
     };
   }
+  if (facts.daemonReady === false) {
+    return {
+      ok: false,
+      headline: "Setup finished with 1 problem.",
+      next: [
+        "Approvals are configured, but this machine cannot start an agent from your phone.",
+        "pushary daemon install   install or repair the background service",
+        "pushary doctor           verify it became reachable"
+      ],
+      exitCode: EXIT.PROBLEMS_FOUND
+    };
+  }
   if (facts.roundTripAnswered === true) {
     return {
       ok: true,
@@ -475,6 +497,12 @@ var parseVerifyMode = (raw) => {
   if (VERIFY_MODES.includes(value)) return value;
   throw new UsageError(`--verify must be one of: ${VERIFY_MODES.join(", ")} (got ${raw})`);
 };
+var CONTROL_MODES = ["auto", "on", "off"];
+var parseControlMode = (raw) => {
+  const value = raw.trim().toLowerCase();
+  if (CONTROL_MODES.includes(value)) return value;
+  throw new UsageError(`--control must be one of: ${CONTROL_MODES.join(", ")} (got ${raw})`);
+};
 var effectiveVerify = (options, context) => {
   if (options.verifyExplicit) return options.verify;
   if (options.verify === "roundtrip") return "roundtrip";
@@ -482,8 +510,9 @@ var effectiveVerify = (options, context) => {
 };
 var SETUP_FLAGS = {
   bools: ["key-stdin", "skip-phone", "yes", "y", "json", "dry-run", "help", "h"],
-  values: ["key", "connect", "agents", "verify"]
+  values: ["key", "connect", "agents", "verify", "control"]
 };
+var effectiveControlMode = (options, stored, configPresent) => options.controlExplicit ? options.control : stored ?? (configPresent ? null : options.control);
 var isAgentChoice = (value) => AGENT_CHOICES.includes(value);
 var parseAgentSelection = (raw, yes) => {
   if (raw === void 0) {
@@ -520,6 +549,7 @@ var parseSetupOptions = (input2) => {
   const connectRaw = flags.values.get("connect");
   const connectMode = connectRaw === void 0 ? "app" : parseConnectMode(connectRaw);
   const verifyRaw = flags.values.get("verify");
+  const controlRaw = flags.values.get("control");
   const nonInteractive = yes || agentsFlag !== void 0 || flags.bools.has("json") || !input2.stdinIsTty;
   const verify = verifyRaw !== void 0 ? parseVerifyMode(verifyRaw) : nonInteractive ? "push" : "roundtrip";
   const key = flags.values.get("key")?.trim() || null;
@@ -555,7 +585,9 @@ var parseSetupOptions = (input2) => {
     key,
     keyStdin,
     verify,
-    verifyExplicit: verifyRaw !== void 0
+    verifyExplicit: verifyRaw !== void 0,
+    control: controlRaw === void 0 ? "auto" : parseControlMode(controlRaw),
+    controlExplicit: controlRaw !== void 0
   };
 };
 
@@ -707,7 +739,9 @@ var checkForUpdates = async (current) => {
   } catch {
   }
 };
+var globalInstallReady = false;
 var installGlobally2 = async () => {
+  if (globalInstallReady) return;
   const version = getPackageVersion();
   await spinner(`Installing pushary-hook globally (${version})`, async () => {
     try {
@@ -716,6 +750,7 @@ var installGlobally2 = async () => {
       throw new Error(npmErrorMessage(err));
     }
   });
+  globalInstallReady = true;
 };
 var _cachedSkillContent = null;
 var fetchSkillContent = async () => {
@@ -1133,14 +1168,17 @@ var installCursorUserHooks = (gateScript) => {
   const bundled = readJson(join3(CURSOR_PLUGIN_DIR, "hooks", "hooks.json")).hooks ?? {};
   let userHooks = {};
   if (existsSync(CURSOR_USER_HOOKS)) {
-    try {
-      userHooks = JSON.parse(readFileSync(CURSOR_USER_HOOKS, "utf-8"));
-    } catch {
+    const result = readJsonSafe(CURSOR_USER_HOOKS);
+    if (result.kind === "ok") userHooks = result.value;
+    else {
+      let backup = "";
       try {
-        cpSync(CURSOR_USER_HOOKS, `${CURSOR_USER_HOOKS}.bak`);
+        backup = backupFile(CURSOR_USER_HOOKS);
       } catch {
       }
-      userHooks = {};
+      throw new Error(
+        `Could not parse or read Cursor hooks.json; left it untouched${backup ? ` and backed it up at ${backup}` : ""}. Fix the file, then re-run setup.`
+      );
     }
   }
   const hooks = userHooks.hooks ?? {};
@@ -1331,10 +1369,10 @@ ${pluginLocationSnippet(VSCODE_PLUGIN_DIR)}`
   console.log(`  ${dim("\u2022")} Fully quit and reopen VS Code to load the plugin`);
   noteManual("Fully quit and reopen VS Code. A Reload Window may not pick up a new plugin location.");
 };
-var saveApiKey = async (apiKey) => {
+var saveApiKey = async (apiKey, controlMode) => {
   let result;
   await spinner("Saving your API key", async () => {
-    result = writeKey(apiKey);
+    result = writeKey(apiKey, controlMode === null ? {} : { controlMode });
   });
   if (!result) throw new Error("Could not save the API key");
   if (result.configBackupPath) {
@@ -1687,7 +1725,7 @@ var AGENT_TARGETS = {
   ],
   custom: ["nothing (prints connection details only)"]
 };
-var reportDryRun = (apiKey, agents, keyCheck) => {
+var reportDryRun = (apiKey, agents, keyCheck, controlMode) => {
   console.log();
   console.log(`  ${bold("Dry run")} ${dim("\u2014 nothing below has been written")}`);
   console.log();
@@ -1695,6 +1733,7 @@ var reportDryRun = (apiKey, agents, keyCheck) => {
     apiKey ? `  ${dim("Key:")}        ${dim(`${apiKey.slice(0, 8)}...${apiKey.slice(-4)}`)} ${dim(`(${keyCheck?.kind ?? "not verified"})`)}` : `  ${dim("Key:")}        ${dim("none on this machine \u2014 a real run would acquire one")}`
   );
   console.log(`  ${dim("Key store:")}  ${PUSHARY_CONFIG_FILE}`);
+  console.log(`  ${dim("Control:")}    ${controlMode ?? "unchanged (legacy install)"}`);
   const rc = resolveShellRc();
   console.log(`  ${dim("Shell rc:")}   ${rc ? rc.path : dim("none for this shell; the export line would be printed instead")}`);
   console.log();
@@ -1733,6 +1772,7 @@ var main = async () => {
 `);
     process.exit(EXIT.OK);
   }
+  const controlMode = effectiveControlMode(options, readControlMode(), existsSync(PUSHARY_CONFIG_FILE));
   recordSetupOptions(options);
   if (options.json) {
     jsonMode = true;
@@ -1791,11 +1831,12 @@ var main = async () => {
     console.log();
     markStep("resolve-agents");
     const plannedAgents = await resolveAgents(options);
-    reportDryRun(null, plannedAgents, null);
-    emitJson(options, { ok: true, dryRun: true, agents: plannedAgents, keyCheck: "skipped", key: "none" });
+    reportDryRun(null, plannedAgents, null, controlMode);
+    emitJson(options, { ok: true, dryRun: true, agents: plannedAgents, control: controlMode, keyCheck: "skipped", key: "none" });
     process.exit(EXIT.OK);
   } else if (connectMode === "app" && canShowPairingQr() && !options.skipPhone) {
     console.log(`  ${dim("Pairing with your Pushary app.")}`);
+    console.log(`  ${dim("Agent control requires a paid plan after the trial. Current pricing:")} ${cyan("https://pushary.com/pricing")}`);
     console.log(`  ${dim("No app yet? Get it at")} ${cyan("https://pushary.com/download")}${dim(", this keeps waiting.")}`);
     console.log(`  ${dim("No phone? Ctrl-C, then:")} ${cyan("npx @pushary/agent-hooks setup --connect browser")}`);
     markStep("pair");
@@ -1878,12 +1919,12 @@ var main = async () => {
   markStep("resolve-agents");
   const agents = await resolveAgents(options);
   if (options.dryRun) {
-    reportDryRun(trimmedKey, agents, keyCheck);
-    emitJson(options, { ok: true, dryRun: true, agents, keyCheck: keyCheck?.kind ?? "skipped" });
+    reportDryRun(trimmedKey, agents, keyCheck, controlMode);
+    emitJson(options, { ok: true, dryRun: true, agents, control: controlMode, keyCheck: keyCheck?.kind ?? "skipped" });
     process.exit(EXIT.OK);
   }
   markStep("save-key");
-  const rc = await saveApiKey(trimmedKey);
+  const rc = await saveApiKey(trimmedKey, controlMode);
   const context = { rc };
   if (envKey && envKey !== trimmedKey) {
     noteManual(
@@ -1893,6 +1934,7 @@ var main = async () => {
   const failed = [];
   const completed = [];
   const skipped = [];
+  let controlDisableFailure = null;
   if (agents.length === 0) {
     console.log(`
   ${check} API key saved. No agents configured.`);
@@ -1931,6 +1973,16 @@ var main = async () => {
       await offerClaudeAlias(options);
     }
   }
+  if (controlMode === "off") {
+    markStep("control:disable");
+    const disabled = await disableDaemonService();
+    if (disabled.kind !== "ok") {
+      controlDisableFailure = disabled.detail;
+      console.log(`  ${yellow("!")} Could not fully disable phone-start: ${controlDisableFailure}`);
+    } else {
+      console.log(`  ${check} Phone-start background service disabled.`);
+    }
+  }
   markStep("connect-phone");
   const skipPhone = options.skipPhone;
   let phone = null;
@@ -1992,6 +2044,8 @@ var main = async () => {
       failed,
       keyCheck: "locked",
       rc: rc.kind,
+      control: controlMode,
+      daemon: controlMode === "off" ? controlDisableFailure ? "unavailable" : "disabled" : "skipped",
       exitCode: report.exitCode
     });
     await reportSetupOutcome({
@@ -2011,6 +2065,36 @@ var main = async () => {
   const reachChecked = phone !== null;
   const reachesYou = phone?.reachesYou ?? true;
   markStep("closing");
+  const keyIsTrusted = keyFromPairing || keyCheck?.kind === "ok";
+  const managedControlAgents = ["claude_code", "codex", "gemini_cli"];
+  const configuredControlAgents = managedControlAgents.filter((agent) => agentIsWired(agent));
+  const controlCapabilities = detectProviderLiveCapabilities(configuredControlAgents.map(
+    (agent) => agent === "claude_code" ? "claude" : agent === "gemini_cli" ? "gemini" : agent
+  ));
+  const providerAvailable = hasSpawnProvider(controlCapabilities);
+  const managerAvailable = daemonServiceManagerAvailable();
+  const servicePresent = readDaemonStatus().kind !== "absent" || hasDaemonServiceDefinition();
+  const controlPolicy = resolveControlPolicy({
+    mode: controlMode,
+    providerAvailable,
+    managerAvailable,
+    servicePresent
+  });
+  if (controlMode === "on" && controlPolicy !== "enabled") {
+    console.log(`  ${yellow("!")} Phone-start was required, but this machine has no supported provider or native background-service manager.`);
+  } else if (controlPolicy === "legacy") {
+    console.log(`  ${yellow("!")} A legacy phone-start service cannot be safely adopted in this session. Disable it with --control off or restore its provider and native service manager.`);
+  }
+  const daemon = keyIsTrusted && controlPolicy === "enabled" ? await (async () => {
+    try {
+      await installGlobally2();
+      const service = await replaceDaemonService();
+      return service.kind === "ok" ? ensureDaemonRunning({ spawnDaemon: () => {
+      } }) : { kind: "unavailable", detail: service.detail };
+    } catch (err) {
+      return { kind: "unavailable", detail: formatError(err) };
+    }
+  })() : controlMode === "on" || controlPolicy === "legacy" ? { kind: "unavailable", detail: "Managed control is required but no usable provider/service-manager pair is available" } : null;
   const closing = describeClosing({
     agentsOk,
     configuredNothing,
@@ -2018,12 +2102,11 @@ var main = async () => {
     failed,
     reachChecked,
     reachesYou,
+    daemonReady: controlDisableFailure ? false : daemon === null ? null : daemon.kind === "running" || daemon.kind === "started",
     // null when the check did not run, so it changes nothing. Only an outright
     // `false` is allowed to hold back "Setup complete.".
     roundTripAnswered: roundTrip === null ? null : roundTrip.kind === "answered" ? true : roundTrip.kind === "unanswered" ? false : null
   });
-  const keyIsTrusted = keyFromPairing || keyCheck?.kind === "ok";
-  const daemon = keyIsTrusted && completed.length > 0 ? await ensureDaemonRunning() : null;
   console.log(`  ${closing.ok ? green(bold(closing.headline)) : yellow(bold(closing.headline))}`);
   if (failed.length > 0) {
     console.log();
@@ -2064,7 +2147,10 @@ var main = async () => {
     roundTrip: roundTrip === null ? "skipped" : roundTrip.kind,
     rc: rc.kind,
     rcPath: rc.path,
-    daemon: daemon?.kind ?? "skipped",
+    daemon: controlMode === "off" ? controlDisableFailure ? "unavailable" : "disabled" : controlPolicy === "unsupported" || controlPolicy === "preserve-absent" ? "unsupported" : daemon?.kind ?? "skipped",
+    control: controlMode,
+    controlPolicy,
+    controlCapabilities,
     exitCode
   });
   if (exitCode !== EXIT.OK) {