toyon 0.13.0 → 0.14.0

package/README.md

@@ -48,7 +48,7 @@ npm i -g toyon
 toyon ~/projects/app
 ```
 
-`toyon .` opens the folder you are in and `toyon --help` lists the rest. A global install keeps itself updated; `TOYON_UPDATES=off` stops it. Run outside a project, Toyon opens with none: describe a new one in a sentence, or give the project picker a git URL to clone.
+`toyon .` opens the folder you are in and `toyon --help` lists the rest. The install button in the top bar makes Toyon an app of its own in Chrome, Arc, Brave or Edge, with a Dock icon and no browser bar; from then on `toyon .` opens that. A global install keeps itself updated; `TOYON_UPDATES=off` stops it. Run outside a project, Toyon opens with none: describe a new one in a sentence, or give the project picker a git URL to clone.
 
 You need:
 

package/dist/cli.js

@@ -7,7 +7,7 @@ import { join as join7, resolve } from "path";
 // package.json
 var package_default = {
   name: "toyon",
-  version: "0.13.0",
+  version: "0.14.0",
   description: "Toyon is where coding agents work on your web app while you check each change by using it. Every chat gets its own running copy with a live preview.",
   license: "MIT",
   type: "module",
@@ -5373,8 +5373,9 @@ function post(route, token, body) {
     body: JSON.stringify(body)
   });
 }
+var shellOrigins = ["http://toyon.localhost", `http://toyon.localhost:${port}`];
 function shellUrl(token, branded) {
-  return branded ? `http://toyon.localhost/#token=${token}` : `http://toyon.localhost:${port}/#token=${token}`;
+  return `${branded ? shellOrigins[0] : shellOrigins[1]}/#token=${token}`;
 }
 
 // src/openUrl.ts
@@ -5404,14 +5405,15 @@ function profilesOf(browser) {
 function pwaStillInstalled(browser, id) {
   return profilesOf(browser).some((p) => existsSync3(join3(p, "Web Applications", "Manifest Resources", id)));
 }
-function findPwaId(browser, manifestId) {
+function findPwaId(browser) {
   const cache = join3(pwaCacheDir, `${browser.replace(/\W+/g, "-")}.id`);
   if (existsSync3(cache)) {
     const id = readFileSync2(cache, "utf8").trim();
     if (/^[a-p]{32}$/.test(id) && pwaStillInstalled(browser, id))
       return id;
   }
-  const re = new RegExp(`web_apps-dt-([a-p]{32})[\\s\\S]{0,16}?${manifestId.replace(/[.*+?^${}()|[\]\\/]/g, "\\$&")}`);
+  const ids = shellOrigins.map((o) => `${o}/`.replace(/[.*+?^${}()|[\]\\/]/g, "\\$&")).join("|");
+  const re = new RegExp(`web_apps-dt-([a-p]{32})[\\s\\S]{0,16}?(?:${ids})`);
   for (const p of profilesOf(browser)) {
     const dir = join3(p, "Sync Data", "LevelDB");
     if (!existsSync3(dir))
@@ -5429,29 +5431,28 @@ function findPwaId(browser, manifestId) {
   }
   return null;
 }
-function showAppWindow(daemon) {
-  const appUrl = shellUrl(daemon.token, false);
-  console.log(`toyon: app window (${appUrl.split("#")[0]})`);
-  if (openAppWindow(appUrl))
+function openShell(daemon) {
+  console.log(`toyon: ${daemon.url}`);
+  const found = process.platform === "darwin" ? launchInstalledApp() : "none";
+  if (found === "launched")
     return;
-  console.log("no Chromium browser found; opening in default browser");
   openUrl(daemon.url);
+  if (found === "uninstalled")
+    console.log("tip: install Toyon as an app from the top bar; toyon then opens in its own window");
 }
-function openAppWindow(appUrl) {
-  const manifestId = new URL("/", appUrl).href;
+function launchInstalledApp() {
+  let seen = false;
   for (const app of CHROMIUMS) {
-    if (spawnSync("open", ["-Ra", app]).status === 0) {
-      const id = findPwaId(app, manifestId);
-      const flag = id ? `--app-id=${id}` : `--app=${appUrl}`;
-      spawn3("open", ["-na", app, "--args", flag], { stdio: "ignore" }).unref();
-      if (!id) {
-        console.log(`tip: install Toyon as an app (browser menu, then Install, or the install button in the top bar when opened in a tab)`);
-        console.log(`     once installed, it gets a native-style title bar; \`toyon --app\` then launches the installed app`);
-      }
-      return true;
-    }
+    if (spawnSync("open", ["-Ra", app]).status !== 0)
+      continue;
+    seen = true;
+    const id = findPwaId(app);
+    if (!id)
+      continue;
+    spawn3("open", ["-na", app, "--args", `--app-id=${id}`], { stdio: "ignore" }).unref();
+    return "launched";
   }
-  return false;
+  return seen ? "uninstalled" : "none";
 }
 
 // src/args.ts
@@ -5532,18 +5533,14 @@ function parseArgs(argv) {
     }
   }
   let path = null;
-  let app = false;
   for (const a of argv) {
-    if (a === "--app" || a === "--pwa")
-      app = true;
-    else if (a.startsWith("-"))
+    if (a.startsWith("-"))
       return { kind: "error", message: `unknown option ${a}` };
-    else if (path !== null)
+    if (path !== null)
       return { kind: "error", message: "Toyon opens one path at a time" };
-    else
-      path = a;
+    path = a;
   }
-  return { kind: "open", path, app };
+  return { kind: "open", path };
 }
 function parseLogs(rest) {
   let follow = false;
@@ -5641,9 +5638,6 @@ usage
   toyon deploy fly destroy <name> [--yes]
                           delete that app and its volume
 
-options for toyon [path]
-  --app                   open a Chromium app window (the installed Toyon app when there is one)
-
 environment
   TOYON_HOME              where state lives (default ~/.toyon)
   TOYON_PORT              the daemon's port (default 4141)
@@ -6218,7 +6212,7 @@ async function helper(args) {
     if (!res.ok)
       console.error(`could not open ${path}: ${await res.text()}`);
   }
-  showAppWindow(daemon);
+  openShell(daemon);
   return 0;
 }
 
@@ -6849,16 +6843,10 @@ async function open2(cmd) {
     const res = await post("/register", daemon.token, { path: target });
     if (!res.ok) {
       console.error(`could not open ${target}: ${await res.text()}`);
-      if (explicit || !cmd.app)
-        return 1;
+      return 1;
     }
   }
-  if (cmd.app)
-    showAppWindow(daemon);
-  else {
-    console.log(`toyon: ${daemon.url}`);
-    openUrl(daemon.url);
-  }
+  openShell(daemon);
   return 0;
 }
 async function start() {

package/dist/daemon.js

@@ -6602,7 +6602,7 @@ ${text.slice(text.length - (CONTEXT_CHARS - HEAD_CHARS))}`;
 }
 
 // ../shared/src/protocol/limits.ts
-var PROTOCOL_VERSION = 105;
+var PROTOCOL_VERSION = 107;
 var PAGE_ERROR_MAX_CHARS = 2000;
 var PAGE_TITLE_MAX_CHARS = 1000;
 var RENDER_ERRORS_MAX = 10;
@@ -8528,7 +8528,7 @@ async function turnRemoteOff(ts, daemonPort, file, was) {
 // ../daemon/package.json
 var package_default = {
   name: "@toyon/daemon",
-  version: "0.13.0",
+  version: "0.14.0",
   private: true,
   type: "module",
   main: "src/index.ts",
@@ -15275,7 +15275,7 @@ function mapUpdate(update, memos, tag, sink, background) {
         out.push({ type: "tool-update", toolId: update.toolCallId, ...refined });
       }
       if (update.content)
-        memo.content = [...memo.content, ...update.content];
+        memo.content = update.content;
       if (update.rawOutput !== undefined)
         memo.rawOutput = update.rawOutput;
       if ((update.status === "completed" || update.status === "failed") && !memo.ended) {
@@ -16182,15 +16182,30 @@ class AcpSession {
       this.emit({ type: "tool-end", toolId, output: output.join(`
 `), isError: true });
     }
-    for (const { event } of this.log.entries)
+    const going = new Set;
+    for (const { event } of this.log.entries) {
       this.trackHandoff(event);
+      if (event.type === "handoff-go")
+        going.add(event.id);
+      else if (event.type === "handoff" || event.type === "handoff-declined")
+        going.delete(event.id);
+    }
+    for (const id of going) {
+      this.emit({
+        type: "handoff-declined",
+        id,
+        outcome: "failed",
+        reason: "Toyon stopped while the worktree was being made",
+        ts: Date.now()
+      });
+    }
     if (this.openHandoffs.size > 0)
       this.syncStatus();
   }
   trackHandoff(event) {
     if (event.type === "handoff-proposed")
       return this.openHandoffs.add(event.id).size > 0;
-    if (event.type === "handoff" || event.type === "handoff-declined")
+    if (event.type === "handoff-go" || event.type === "handoff" || event.type === "handoff-declined")
       return this.openHandoffs.delete(event.id);
     return false;
   }
@@ -18641,6 +18656,8 @@ class RuntimeRegistry {
     }
     if (this.settingUp.has(id))
       return;
+    if (wt.kind === "spare" && wt.phase !== undefined && wt.phase !== "ready")
+      return;
     const repo = this.deps.state.repos.find((r) => r.id === wt.repoId);
     if (repo)
       await this.start(wt, repo);
@@ -19435,7 +19452,7 @@ function openAskOf(entries) {
       open.delete(e.id);
     else if (e.type === "handoff-proposed")
       open.set(e.id, `Continue in ${e.repo.name}?`);
-    else if (e.type === "handoff" || e.type === "handoff-declined")
+    else if (e.type === "handoff-go" || e.type === "handoff" || e.type === "handoff-declined")
       open.delete(e.id);
   }
   const last = [...open.values()].at(-1)?.trim();
@@ -22738,9 +22755,14 @@ async function behindUpstream(worktreePath) {
   const r = await git(worktreePath, "rev-list", "--count", "HEAD..@{upstream}");
   return r.ok ? Number(r.out) || 0 : null;
 }
-async function aheadUpstream(worktreePath) {
+async function aheadUpstream(worktreePath, branch) {
   const r = await git(worktreePath, "rev-list", "--count", "@{upstream}..HEAD");
-  return r.ok ? Number(r.out) || 0 : null;
+  if (r.ok)
+    return Number(r.out) || 0;
+  if (!branch)
+    return null;
+  const o = await git(worktreePath, "rev-list", "--count", `origin/${branch}..HEAD`);
+  return o.ok ? Number(o.out) || 0 : null;
 }
 async function aheadBehind(worktreePath, defaultBr) {
   const [a, b] = await Promise.all([
@@ -28964,10 +28986,12 @@ var handlers = {
       const followUp = msg.attachments?.length ? { attachments: msg.attachments } : undefined;
       s.runtime.agentFor(msg.worktreeId)?.answer(msg.askId, { kind: "answers", answers: msg.answers }, followUp);
     });
+    s.worktrees.markPrompted(msg.worktreeId);
   },
   "agent-decide"(msg, _ctx, s) {
     requireRun(s, msg.worktreeId);
     s.runtime.agentFor(msg.worktreeId)?.answer(msg.askId, { kind: "choice", choiceId: msg.choiceId });
+    s.worktrees.markPrompted(msg.worktreeId);
   },
   async "handoff-answer"(msg, _ctx, s) {
     requireRun(s, msg.worktreeId);
@@ -29061,8 +29085,8 @@ var handlers = {
     ctx.reply({ t: "refs", repoId: msg.repoId, query: msg.query, refs });
   },
   async "search-chats"(msg, ctx, s) {
-    const { hits, truncated } = await s.chats.search(msg.repoId, msg.query);
-    ctx.reply({ t: "chat-hits", repoId: msg.repoId, query: msg.query, hits, truncated });
+    const { hits, truncated, asks } = await s.chats.search(msg.repoId, msg.query);
+    ctx.reply({ t: "chat-hits", repoId: msg.repoId, query: msg.query, hits, truncated, asks });
   },
   async "open-ref"(msg, _ctx, s) {
     await s.worktrees.openRef(msg.repoId, msg.kind, msg.ref, { createdBy: msg.clientId, pr: msg.pr });
@@ -30815,6 +30839,7 @@ var CHAT_HITS_MAX = 200;
 var MIN_QUERY = 2;
 var SNIPPET = 160;
 var BEFORE = 50;
+var ASK = 500;
 var bunFs2 = {
   async stat(path) {
     try {
@@ -30886,6 +30911,9 @@ function searchRows(rows, terms, chat, limit = CHAT_HITS_PER_WORKTREE) {
   }
   return { hits, more: false };
 }
+function firstAsk(rows) {
+  return rows.find((r) => r.role === "user")?.text.slice(0, ASK);
+}
 function termRanges(lower, terms) {
   const ranges = [];
   for (const term of terms) {
@@ -30907,7 +30935,7 @@ class ChatSearch {
     this.d.state.requireRepo(repoId);
     const terms = needleTerms(query);
     if (terms.length === 0)
-      return { hits: [], truncated: false };
+      return { hits: [], truncated: false, asks: {} };
     const chats = [
       ...this.d.state.worktrees.filter((w) => w.repoId === repoId && w.kind === "worktree").map((w) => ({ id: w.id, archived: false, path: this.d.transcriptPath(w.id) })),
       ...this.d.archivedChats(repoId).map((a) => ({ id: a.id, archived: true, path: a.transcript }))
@@ -30915,13 +30943,23 @@ class ChatSearch {
     const read = new Set;
     const found = await Promise.all(chats.map(async (c) => {
       const rows = await this.rowsOf(c.id, c.archived, c.path, read);
-      return searchRows(rows, terms, { worktreeId: c.id, archived: c.archived });
+      return {
+        id: c.id,
+        ...searchRows(rows, terms, { worktreeId: c.id, archived: c.archived }),
+        ask: firstAsk(rows)
+      };
     }));
     for (const key of this.said.keys())
       if (!read.has(key))
         this.said.delete(key);
     const all = found.filter((f) => f.hits.length > 0).sort((a, b) => b.hits[0].ts - a.hits[0].ts).flatMap((f) => f.hits);
-    return { hits: all.slice(0, CHAT_HITS_MAX), truncated: all.length > CHAT_HITS_MAX || found.some((f) => f.more) };
+    const hits = all.slice(0, CHAT_HITS_MAX);
+    const kept = new Set(hits.map((h) => h.worktreeId));
+    const asks = {};
+    for (const f of found)
+      if (f.ask && kept.has(f.id))
+        asks[f.id] = f.ask;
+    return { hits, truncated: all.length > CHAT_HITS_MAX || found.some((f) => f.more), asks };
   }
   async rowsOf(id, archived, path, read) {
     const live = archived ? undefined : this.d.live(id);
@@ -31107,7 +31145,7 @@ function openProposals(entries) {
   for (const { event } of entries) {
     if (event.type === "handoff-proposed")
       open.set(event.id, event);
-    else if (event.type === "handoff" || event.type === "handoff-declined")
+    else if (event.type === "handoff-go" || event.type === "handoff" || event.type === "handoff-declined")
       open.delete(event.id);
   }
   return [...open.values()];
@@ -31126,7 +31164,6 @@ function proposedThisTurn(entries) {
 
 class HandoffService {
   d;
-  settling = new Set;
   constructor(d) {
     this.d = d;
     d.hub.on("landed", (worktreeId) => this.landed(worktreeId));
@@ -31239,13 +31276,11 @@ class HandoffService {
     if (!openProposals(entries).some((p) => p.id === id)) {
       return log.debug(worktreeId, `answer for a handoff that already closed (${id})`);
     }
-    if (this.settling.has(id))
-      return;
     if (!go) {
       agent.note({ type: "handoff-declined", id, ts: Date.now() });
       return;
     }
-    this.settling.add(id);
+    agent.note({ type: "handoff-go", id, ts: Date.now() });
     try {
       const repo = this.d.state.repo(proposed.repo.id);
       if (!repo)
@@ -31271,8 +31306,6 @@ class HandoffService {
       const reason = e instanceof Error ? e.message : String(e);
       agent.note({ type: "handoff-declined", id, outcome: "failed", reason, ts: Date.now() });
       throw e;
-    } finally {
-      this.settling.delete(id);
     }
   }
   async ask(worktreeId, repoId, text) {
@@ -33107,6 +33140,7 @@ class SparePool {
       await withRepoLock(repo.path, () => gitOrThrow(repo.path, "worktree", "add", "--detach", wt.path, baseOf(repo)));
     })();
     const done = (async () => {
+      this.d.runtime.markSetup(wt.id, true);
       try {
         await added;
         if (after) {
@@ -33136,6 +33170,7 @@ class SparePool {
       } catch (e) {
         await this.rollBack(wt, e);
       } finally {
+        this.d.runtime.markSetup(wt.id, false);
         if (this.inflight.get(repoId)?.added === added)
           this.inflight.delete(repoId);
       }
@@ -33600,7 +33635,7 @@ class WorktreeService {
         claimed.effort = opts.effort;
       if (profile !== undefined && profile !== resolveRun(repo, claimed).profile) {
         claimed.profile = profile;
-        this.restartProcs(claimed, repo);
+        this.restartProcs(claimed);
       }
       const carried = await this.carryMain(repo, claimed, !!opts.carry);
       this.d.state.save();
@@ -33852,8 +33887,8 @@ class WorktreeService {
       throw new UserError(`no profile "${name}" in ${repo.configFile}`);
     return name;
   }
-  restartProcs(wt, repo) {
-    fireAndForget(wt.id, this.d.runtime.stopProcs(wt.id).then(() => this.d.runtime.start(wt, repo)), "profile restart");
+  restartProcs(wt) {
+    fireAndForget(wt.id, this.d.runtime.stopProcs(wt.id).then(() => this.d.runtime.wake(wt.id)), "profile restart");
   }
   setProfile(worktreeId, name) {
     const { wt, repo } = this.d.state.requireWorktreeWithRepo(worktreeId);
@@ -33865,7 +33900,7 @@ class WorktreeService {
     wt.profile = profile;
     this.d.state.save();
     this.d.hub.emit("worktreesChanged");
-    this.restartProcs(wt, repo);
+    this.restartProcs(wt);
   }
   setMode(worktreeId, mode) {
     if (!this.d.state.setMode(worktreeId, mode))
@@ -34725,7 +34760,7 @@ ${wt.landing.body}` : wt.landing.subject : undefined;
         return { result: fetched };
       if (wt.pr?.state === "open") {
         const dirty = (await statusFiles(wt.path)).length > 0;
-        const missing = dirty || (await aheadUpstream(wt.path) ?? 0) > 0;
+        const missing = dirty || (await aheadUpstream(wt.path, wt.branch) ?? 0) > 0;
         if (!missing)
           return { result: await mergePr(wt.path, wt.pr.number, policy.merge, w) };
         const committed = await this.commitIfDirty(wt, message);
@@ -35157,9 +35192,10 @@ ${wt.landing.body}` : wt.landing.subject : undefined;
     return { ...ab, ...unpushed === undefined ? {} : { unpushed }, dirty };
   }
   async unpushed(id, path) {
-    if (this.d.state.worktree(id)?.pr?.state !== "open")
+    const wt = this.d.state.worktree(id);
+    if (wt?.pr?.state !== "open")
       return;
-    return await aheadUpstream(path) ?? undefined;
+    return await aheadUpstream(path, wt.branch) ?? undefined;
   }
   async freshCounts(worktreeId) {
     if (this.going.has(worktreeId))