agentstuff 0.1.2 → 0.1.3

package/README.md

@@ -11,7 +11,7 @@ bun add --global agentstuff
 agentstuff setup
 ```
 
-Setup opens an interactive wizard. It can perform a complete setup, repair only the desktop integration, pair another iPhone, or change the terminal shortcut. The complete flow checks prerequisites, installs the background service and terminal integration, selects an available short command, prepares the mobile app, displays the private pairing QR, and waits for connection confirmation.
+Setup starts with two paths: a complete guided setup or a fast desktop repair. Complete setup walks through the iPhone, desktop integration, and terminal shortcut as separate numbered steps. Existing configuration is detected at every step, so you can show the current pairing code, rotate it, keep a healthy integration, or change the shortcut without redoing unrelated setup.
 
 When run from an Agentstuff development checkout, the wizard can build and install the iOS development app with Xcode. A configured `AGENTSTUFF_MOBILE_INSTALL_URL` enables the public mobile-download option. Until a TestFlight or App Store build is configured, npm cannot install a signed iOS app by itself.
 

package/dist/index.js

@@ -39569,6 +39569,65 @@ var runWith2 = (command, config) => {
     yield* provideContext2(program, services);
   }, catchFilter2((error2) => isCliError(error2) && error2._tag === "ShowHelp" ? succeed2(error2) : fail2(error2), (error2) => andThen2(showHelp(command, error2), fail6(error2))), catchFilter2((e) => isQuitError(e) ? succeed2(e) : fail2(e), (_) => interrupt3));
 };
+// package.json
+var package_default = {
+  name: "agentstuff",
+  version: "0.1.3",
+  description: "Continue terminal agent sessions securely from your phone",
+  license: "UNLICENSED",
+  type: "module",
+  os: ["darwin"],
+  engines: {
+    bun: ">=1.3.10"
+  },
+  files: [
+    "dist",
+    "README.md"
+  ],
+  bin: {
+    agentstuff: "dist/index.js"
+  },
+  repository: {
+    type: "git",
+    url: "git+https://github.com/swarajbachu/agent-stuff.git",
+    directory: "apps/daemon"
+  },
+  homepage: "https://github.com/swarajbachu/agent-stuff#readme",
+  bugs: "https://github.com/swarajbachu/agent-stuff/issues",
+  keywords: [
+    "ai",
+    "agent",
+    "mobile",
+    "terminal",
+    "bun"
+  ],
+  scripts: {
+    build: "bun build src/index.ts --outdir dist --target bun",
+    dev: "bun --watch src/index.ts start",
+    prepack: "bun run build",
+    start: "bun src/index.ts start",
+    "test:relay-client": "bun scripts/relay-client.ts",
+    "spike:claude-resume": "bun scripts/claude-resume.ts",
+    "spike:codex-app-server": "bun scripts/codex-app-server.ts",
+    test: "bun test src",
+    typecheck: "tsc -p tsconfig.json --noEmit"
+  },
+  devDependencies: {
+    "@agentstuff/crypto": "workspace:*",
+    "@agentstuff/protocol": "workspace:*",
+    "@anthropic-ai/claude-agent-sdk": "^0.3.0",
+    "@effect/platform-bun": "4.0.0-beta.97",
+    "@effect/sql-sqlite-bun": "4.0.0-beta.97",
+    "@modelcontextprotocol/sdk": "^1.29.0",
+    chokidar: "^4.0.0",
+    effect: "4.0.0-beta.97",
+    "qrcode-terminal": "^0.12.0",
+    zod: "4.4.3",
+    "@types/bun": "^1.3.14",
+    "@types/qrcode-terminal": "^0.12.2"
+  }
+};
+
 // src/adapters/AdapterRegistry.ts
 class AdapterNotFound extends TaggedErrorClass()("AdapterNotFound", {
   provider: String4
@@ -82105,6 +82164,23 @@ var installedShellCommand = fn2("ShellIntegration.status")(function* (path5 = sh
 });
 
 // src/setup.ts
+var pairingActions = (hasExistingPairing) => hasExistingPairing ? ["show", "rotate", "keep"] : ["create"];
+var pairingPromptChoice = (action2, phoneConnected) => {
+  switch (action2) {
+    case "create":
+      return { title: "Create a pairing code", value: action2, description: "Securely connect this Mac and iPhone" };
+    case "show":
+      return { title: "Show the current pairing code", value: action2, description: "Existing paired phones keep working" };
+    case "rotate":
+      return { title: "Generate a new pairing code", value: action2, description: "Revokes every previously shared code" };
+    case "keep":
+      return {
+        title: "Keep the current pairing",
+        value: action2,
+        description: phoneConnected ? "An authenticated iPhone is connected" : "Skip showing a pairing code"
+      };
+  }
+};
 var setupErrorMessage = (error52) => {
   if (isObject(error52) && hasProperty(error52, "_tag") && error52._tag === "QuitError") {
     return "Setup cancelled.";
@@ -82126,8 +82202,8 @@ var MobileInstallUrl = String4.pipe(check(makeFilter2((value2) => {
 var decodeMobileInstallUrl = decodeUnknownOption2(MobileInstallUrl);
 var setupSections = (mode) => ({
   desktop: mode === "complete" || mode === "repair",
-  shortcut: mode === "complete" || mode === "shortcut",
-  phone: mode === "complete" || mode === "pair"
+  shortcut: mode === "complete",
+  phone: mode === "complete"
 });
 var findMobileProject = (start = process.cwd(), exists = existsSync3) => {
   let directory4 = resolve6(start);
@@ -82149,10 +82225,8 @@ var selectMode = fn2("Setup.selectMode")(function* (yes) {
   return yield* exports_Prompt.select({
     message: "What would you like to set up?",
     choices: [
-      { title: "Complete setup", value: "complete", description: "Desktop, terminal shortcut, and iPhone pairing" },
-      { title: "Repair desktop integration", value: "repair", description: "Reinstall the background service and live channel" },
-      { title: "Pair an iPhone", value: "pair", description: "Install or open the mobile app and show a pairing code" },
-      { title: "Configure terminal shortcut", value: "shortcut", description: "Choose the command used to start connected sessions" }
+      { title: "Complete setup", value: "complete", description: "Walk through iPhone, desktop, and terminal setup" },
+      { title: "Repair setup", value: "repair", description: "Reinstall the background service and live terminal integration" }
     ]
   });
 });
@@ -82165,10 +82239,27 @@ var runCommand = fn2("Setup.runCommand")(function* (executable2, arguments_, cwd
     stderr: "inherit"
   }));
 });
-var configureShortcut = fn2("Setup.configureShortcut")(function* (options) {
+var configureShortcut = fn2("Setup.configureShortcut")(function* (options, existingCommand) {
   if (options.noAlias)
     return none2();
   let commandName = getOrUndefined(options.alias);
+  if (!options.yes && commandName === undefined && existingCommand !== undefined) {
+    const action2 = yield* exports_Prompt.select({
+      message: `Terminal shortcut \`${existingCommand}\` is already configured.`,
+      choices: [
+        { title: `Keep ${existingCommand}`, value: "keep", description: "No shell changes needed" },
+        { title: "Choose a different shortcut", value: "change", description: "Replace the current Agentstuff shortcut" }
+      ]
+    });
+    if (action2 === "keep") {
+      yield* log(`\u2713 Terminal shortcut: ${existingCommand}`);
+      return some2(existingCommand);
+    }
+    commandName = yield* exports_Prompt.text({
+      message: "New shortcut name",
+      default: existingCommand === "agt" ? "astuff" : "agt"
+    });
+  }
   if (!options.yes && commandName === undefined) {
     const choice5 = yield* exports_Prompt.select({
       message: "How should connected terminal sessions start?",
@@ -82259,69 +82350,130 @@ var runGuidedSetup = fn2("Setup.run")(function* (options) {
   yield* log("");
   const mode = yield* selectMode(options.yes);
   const sections = setupSections(mode);
-  if (sections.desktop && !claudeFound) {
+  if (mode === "repair" && !claudeFound) {
     yield* error("Claude CLI is required for live terminal integration. Install it, then rerun setup.");
     return;
   }
-  let rotate = options.reset;
-  if (sections.phone && isSome2(existing) && !options.yes && !options.reset) {
-    rotate = yield* exports_Prompt.select({
-      message: "Which pairing credential should this phone use?",
-      choices: [
-        { title: "Keep the current pairing", value: false, description: "Existing paired phones keep working" },
-        { title: "Rotate the pairing", value: true, description: "Revokes every previously shared pairing code" }
-      ]
-    });
-  }
   const relayUrl = getOrUndefined(options.relay);
+  const presencePath = join8(options.dataDirectory, "mobile-presence.json");
+  let daemonRunning = daemon.installed;
+  let integrationReady = integrationInstalled;
+  let phoneConnected = yield* loadMobilePresence(presencePath).pipe(catch_2(() => succeed7(false)));
   let configured = none2();
-  if (sections.desktop || sections.phone) {
-    configured = some2(yield* configurePairing({
+  const ensurePairing = fn2("Setup.ensurePairing")(function* (reset2) {
+    const result3 = yield* configurePairing({
       ...relayUrl === undefined ? {} : { relayUrl },
-      reset: rotate
-    }));
-  }
-  if (!sections.desktop && isSome2(configured) && configured.value.changed && daemon.installed) {
-    yield* restartDaemon();
-  }
-  if (sections.desktop) {
-    yield* installTerminalIntegration(undefined, true);
-    yield* log("\u2713 Live terminal integration");
-    yield* installDaemon({ dataDirectory: options.dataDirectory, load: true });
-    yield* log("\u2713 Background service");
-  } else if (sections.phone && !daemon.installed) {
-    yield* installDaemon({ dataDirectory: options.dataDirectory, load: true });
-    yield* log("\u2713 Background service");
-  }
-  const shortcut = sections.shortcut ? yield* configureShortcut(options) : none2();
-  let phoneConnected = false;
-  if (sections.phone && !options.noPair && isSome2(configured) && (yield* prepareMobileApp(options.yes))) {
+      reset: reset2
+    });
+    if (result3.changed) {
+      phoneConnected = false;
+      yield* saveMobilePresence(false, presencePath);
+    }
+    configured = some2(result3);
+    return result3;
+  });
+  if (sections.phone) {
     yield* log(`
+Step 1 of 3 \xB7 Connect your iPhone
+`);
+    if (options.noPair) {
+      yield* log("\xB7 Phone pairing skipped by --no-pair");
+    } else {
+      const hasExistingPairing = isSome2(existing);
+      const pairingAction = options.reset ? "rotate" : options.yes ? hasExistingPairing ? "show" : "create" : hasExistingPairing ? yield* exports_Prompt.select({
+        message: "Mobile pairing is already configured. What should we do?",
+        choices: pairingActions(true).map((action2) => pairingPromptChoice(action2, phoneConnected))
+      }) : "create";
+      if (pairingAction === "keep") {
+        yield* log(`\u2713 Current pairing kept${phoneConnected ? " \xB7 iPhone connected" : ""}`);
+      } else {
+        const pairing = yield* ensurePairing(pairingAction === "rotate");
+        if (pairing.changed && daemonRunning)
+          yield* restartDaemon();
+        if (!daemonRunning) {
+          yield* installDaemon({ dataDirectory: options.dataDirectory, load: true });
+          daemonRunning = true;
+          yield* log("\u2713 Background service started for pairing");
+        }
+        if (yield* prepareMobileApp(options.yes)) {
+          yield* log(`
 On your iPhone, open Agentstuff \u2192 Connect your Mac \u2192 Scan pairing code.
 `);
-    yield* renderQr(pairingUrl(configured.value.pairing));
-    yield* log("Waiting for an authenticated iPhone connection\u2026");
-    phoneConnected = yield* waitForMobilePresence(join8(options.dataDirectory, "mobile-presence.json"), options.yes ? 10 : 60);
-    while (!phoneConnected && !options.yes) {
-      const action2 = yield* exports_Prompt.select({
-        message: "The iPhone has not connected yet.",
+          yield* renderQr(pairingUrl(pairing.pairing));
+          yield* log("Waiting for an authenticated iPhone connection\u2026");
+          phoneConnected = yield* waitForMobilePresence(presencePath, options.yes ? 10 : 60);
+          while (!phoneConnected && !options.yes) {
+            const action2 = yield* exports_Prompt.select({
+              message: "The iPhone has not connected yet.",
+              choices: [
+                { title: "Wait another 30 seconds", value: "retry", description: "Keep the app open after scanning" },
+                { title: "Continue setup and pair later", value: "later", description: "The pairing code remains ready" }
+              ]
+            });
+            if (action2 === "later")
+              break;
+            phoneConnected = yield* waitForMobilePresence(presencePath, 60);
+          }
+          yield* log(phoneConnected ? "\u2713 Authenticated iPhone connected" : "! Pairing is ready. Scan the code from Agentstuff when your phone is available.");
+        }
+      }
+    }
+  }
+  if (sections.desktop) {
+    yield* log(mode === "complete" ? `
+Step 2 of 3 \xB7 Configure terminal integration
+` : `
+Repairing desktop integration
+`);
+    if (!claudeFound) {
+      yield* log("! Terminal integration skipped because the required CLI is not installed.");
+      yield* log("  Install it, then choose Repair setup.");
+    } else {
+      const healthy = integrationReady && daemonRunning;
+      const desktopAction = mode === "repair" || options.yes ? "install" : healthy ? yield* exports_Prompt.select({
+        message: "Terminal integration is already running.",
         choices: [
-          { title: "Wait another 30 seconds", value: "retry", description: "Keep the app open after scanning" },
-          { title: "Finish pairing later", value: "later", description: "Your desktop setup is already complete" }
+          { title: "Keep the current integration", value: "keep", description: "No changes needed" },
+          { title: "Reinstall the integration", value: "install", description: "Refresh the service and live terminal channel" }
+        ]
+      }) : yield* exports_Prompt.select({
+        message: "Terminal integration needs attention.",
+        choices: [
+          {
+            title: "Configure it now",
+            value: "install",
+            description: integrationReady ? "Restart the background service" : "Install the live terminal channel and background service"
+          },
+          { title: "Skip for now", value: "skip", description: "Finish from Repair setup later" }
         ]
       });
-      if (action2 === "later")
-        break;
-      phoneConnected = yield* waitForMobilePresence(join8(options.dataDirectory, "mobile-presence.json"), 60);
-    }
-    if (!phoneConnected) {
-      yield* log("! Pairing is ready. Open Agentstuff and scan the code when your phone is available.");
+      if (desktopAction === "install") {
+        if (isNone2(configured))
+          yield* ensurePairing(options.reset && options.noPair);
+        yield* installTerminalIntegration(undefined, true);
+        integrationReady = true;
+        yield* log("\u2713 Live terminal integration configured");
+        yield* installDaemon({ dataDirectory: options.dataDirectory, load: true });
+        daemonRunning = true;
+        yield* log("\u2713 Background service running");
+      } else if (desktopAction === "keep") {
+        yield* log("\u2713 Current terminal integration kept");
+      } else {
+        yield* log("\xB7 Terminal integration skipped");
+      }
     }
   }
-  const launchCommand = getOrElse(shortcut, () => "agentstuff claude");
+  let shortcut = none2();
+  if (sections.shortcut) {
+    yield* log(`
+Step 3 of 3 \xB7 Configure terminal shortcut
+`);
+    shortcut = yield* configureShortcut(options, shellCommand);
+  }
+  const launchCommand = getOrElse(shortcut, () => shellCommand ?? "agentstuff claude");
   yield* log(`
 Ready.`);
-  if (sections.desktop)
+  if (integrationReady && daemonRunning)
     yield* log("  \u2713 Desktop integration running");
   if (phoneConnected)
     yield* log("  \u2713 iPhone connected");
@@ -85030,5 +85182,5 @@ if (rawCommand === "terminal" || rawCommand === "claude") {
     process.exitCode = exitCode;
   })), asVoid2, provide4(exports_BunServices.layer)));
 } else {
-  cli.pipe(exports_Command.run({ version: "0.1.2" }), provide4(exports_BunServices.layer), exports_BunRuntime.runMain);
+  cli.pipe(exports_Command.run({ version: package_default.version }), provide4(exports_BunServices.layer), exports_BunRuntime.runMain);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentstuff",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Continue terminal agent sessions securely from your phone",
   "license": "UNLICENSED",
   "type": "module",
@@ -13,7 +13,7 @@
     "README.md"
   ],
   "bin": {
-    "agentstuff": "./dist/index.js"
+    "agentstuff": "dist/index.js"
   },
   "repository": {
     "type": "git",
@@ -41,8 +41,8 @@
     "typecheck": "tsc -p tsconfig.json --noEmit"
   },
   "devDependencies": {
-    "@agentstuff/crypto": "0.0.0",
-    "@agentstuff/protocol": "0.0.0",
+    "@agentstuff/crypto": "workspace:*",
+    "@agentstuff/protocol": "workspace:*",
     "@anthropic-ai/claude-agent-sdk": "^0.3.0",
     "@effect/platform-bun": "4.0.0-beta.97",
     "@effect/sql-sqlite-bun": "4.0.0-beta.97",