@zgeoff/atc 3.3.1 → 3.4.1

package/src/client/resolve-workspace-root.ts

@@ -21,13 +21,18 @@ const DEFAULT_ROOT = '~/.local/share/atc/workspaces';
  * root, else the global root, else the default. On the daemon's own
  * machine a leading `~` expands to the home directory. On any other target
  * the root must be absolute, since `~` there is a home this client cannot
- * see, so a root that is not is refused with the config key to set.
+ * see, so a root that is not is refused with the config key to set. The
+ * home directory defaults to the user's own.
  */
-export function resolveWorkspaceRoot(config: WorkspacesConfig, target: RootTarget): WorkspaceRoot {
+export function resolveWorkspaceRoot(
+  config: WorkspacesConfig,
+  target: RootTarget,
+  home: string = resolveHomeDir(),
+): WorkspaceRoot {
   const configured = config.targetRoots.get(target.id) ?? config.root;
 
   if (target.inPlace) {
-    const root = expandHome(configured ?? DEFAULT_ROOT);
+    const root = expandHome(configured ?? DEFAULT_ROOT, home);
 
     return root.startsWith('/')
       ? { ok: true, root }
@@ -44,6 +49,6 @@ export function resolveWorkspaceRoot(config: WorkspacesConfig, target: RootTarge
   return { ok: true, root: configured };
 }
 
-function expandHome(dir: string): string {
-  return dir === '~' || dir.startsWith('~/') ? `${resolveHomeDir()}${dir.slice(1)}` : dir;
+function expandHome(dir: string, home: string): string {
+  return dir === '~' || dir.startsWith('~/') ? `${home}${dir.slice(1)}` : dir;
 }

package/src/client/spawn-picker.ts

@@ -34,6 +34,18 @@ type PickerStep =
   | 'prompt'
   | 'spawned';
 
+// The kinds of answer the flow can drop: a git source's listing, a
+// directory source's listing, each request a step waits on, the daemon's
+// targets and sources, and the local directory flow's listing.
+export type DroppedAnswer =
+  | 'listing'
+  | 'directory listing'
+  | 'interpret'
+  | 'probe'
+  | 'spawn'
+  | 'targets and sources'
+  | 'local directory listing';
+
 // What the flow borrows from the client that owns the screen, the daemon
 // connection and the fleet mirror.
 export interface SpawnPickerDeps<TMirror> {
@@ -50,6 +62,27 @@ export interface SpawnPickerDeps<TMirror> {
   readonly toMirrorSession: (value: unknown) => TMirror | null;
   readonly upsertMirror: (session: Readonly<TMirror>) => void;
   readonly hasDaemonFeature: (feature: DaemonFeature) => boolean;
+
+  // Where the flow draws: every byte of the picker's screen goes through it.
+  readonly write: (chunk: string) => void;
+
+  // The client's own directory, which the directory step lists first.
+  readonly cwd: string;
+
+  // The config file the flow reads its agents, roots, and workspaces from
+  // each time it opens.
+  readonly configPath: string;
+
+  // Called each time the flow drops an answer, with the kind of answer it
+  // dropped: one for a flow or a request that has since moved on, which
+  // changes nothing, or a listing for a source the flow has left, which
+  // fills nothing and only clears the pending listing so that source lists
+  // again when its step reopens.
+  readonly onDropAnswer?: (kind: DroppedAnswer) => void;
+
+  // Records any other decision the flow takes without drawing anything,
+  // such as text it ignores on a step that takes none.
+  readonly log?: (line: string) => void;
 }
 
 // One source `agents.list` returned, in the order the daemon offers them.
@@ -279,7 +312,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
     this.generation += 1;
     this.resume = resume;
 
-    const config = loadConfig();
+    const config = loadConfig(this.deps.configPath);
 
     this.picks = collectAgentPicks(config);
     this.roots = config.dirs.roots;
@@ -315,7 +348,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
     this.refusal = null;
     this.pending = null;
 
-    process.stdout.write(ansi.clear);
+    this.deps.write(ansi.clear);
 
     // One installed agent is no choice to make, so the flow goes on with it.
     if (this.picks.length === 1) {
@@ -439,13 +472,16 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
         hint = 'reading targets and sources… · esc cancel';
       }
 
-      drawPicker({
-        title: `${verb}: agent`,
-        items: this.picks.map((p) => p.label),
-        selected: this.selected,
-        input: this.input,
-        hint,
-      });
+      drawPicker(
+        {
+          title: `${verb}: agent`,
+          items: this.picks.map((p) => p.label),
+          selected: this.selected,
+          input: this.input,
+          hint,
+        },
+        this.deps.write,
+      );
     } else if (this.step === 'dir') {
       this.renderDirStep(verb);
     } else if (this.step === 'source') {
@@ -457,36 +493,45 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
     } else if (this.step === 'confirm') {
       this.renderConfirmStep();
     } else if (this.step === 'spawned') {
-      drawPicker({
-        title: `${verb}: started`,
-        items: this.spawnWarnings.flatMap((w) => splitToWidth(w, getPickerWidth() - 4)),
-        selected: -1,
-        input: '',
-        hint: '⏎ attach · esc back',
-      });
+      drawPicker(
+        {
+          title: `${verb}: started`,
+          items: this.spawnWarnings.flatMap((w) => splitToWidth(w, getPickerWidth() - 4)),
+          selected: -1,
+          input: '',
+          hint: '⏎ attach · esc back',
+        },
+        this.deps.write,
+      );
     } else if (this.step === 'name') {
       const where = this.isGitFlow() ? this.formatDestination() : formatDir(this.dir);
 
-      drawPicker({
-        title: `${verb}: name`,
-        items: [],
-        selected: -1,
-        input: this.input,
-        placeholder: formatDirName(this.autoDestination ?? this.dir),
-        hint: this.refusal ?? `session name for ${where} · ⏎ accept · esc back`,
-      });
+      drawPicker(
+        {
+          title: `${verb}: name`,
+          items: [],
+          selected: -1,
+          input: this.input,
+          placeholder: formatDirName(this.autoDestination ?? this.dir),
+          hint: this.refusal ?? `session name for ${where} · ⏎ accept · esc back`,
+        },
+        this.deps.write,
+      );
     } else {
-      drawPicker({
-        title: 'spawn: initial prompt',
-        items: [],
-        selected: -1,
-        input: this.input,
-        placeholder: 'optional — ⏎ to start interactive',
-        hint:
-          this.pending?.label ??
-          this.refusal ??
-          'first message for the session · ⏎ spawn · esc back',
-      });
+      drawPicker(
+        {
+          title: 'spawn: initial prompt',
+          items: [],
+          selected: -1,
+          input: this.input,
+          placeholder: 'optional — ⏎ to start interactive',
+          hint:
+            this.pending?.label ??
+            this.refusal ??
+            'first message for the session · ⏎ spawn · esc back',
+        },
+        this.deps.write,
+      );
     }
 
     this.deps.scheduleStatus();
@@ -518,16 +563,19 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
 
     this.selected = Math.min(this.selected, Math.max(0, Math.min(items.length, 10) - 1));
 
-    drawPicker({
-      title: `${verb}: ${this.findSource()?.label ?? 'directory'}`,
-      items,
-      selected: this.selected,
-      input: this.input,
-      hint:
-        this.pending?.label ??
-        this.refusal ??
-        `type to filter, or a path (/ ~ .) · ↑↓ move · ⏎ select${this.formatTabHint()} · esc cancel`,
-    });
+    drawPicker(
+      {
+        title: `${verb}: ${this.findSource()?.label ?? 'directory'}`,
+        items,
+        selected: this.selected,
+        input: this.input,
+        hint:
+          this.pending?.label ??
+          this.refusal ??
+          `type to filter, or a path (/ ~ .) · ↑↓ move · ⏎ select${this.formatTabHint()} · esc cancel`,
+      },
+      this.deps.write,
+    );
   }
 
   private renderTargetStep(verb: string) {
@@ -544,18 +592,21 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
       hint = `${gap} · set targets in config.json · esc back`;
     }
 
-    drawPicker({
-      title: `${verb}: target`,
-      items: this.targets.map((t) => formatTargetPick(t)),
-      selected: this.selected,
-      input: '',
-      hint: this.refusal ?? hint,
-      dimmed: new Set(
-        this.targets.flatMap((t, i) =>
-          t.takesWorkspace || (!git && t.available && t.inPlace) ? [] : [i],
+    drawPicker(
+      {
+        title: `${verb}: target`,
+        items: this.targets.map((t) => formatTargetPick(t)),
+        selected: this.selected,
+        input: '',
+        hint: this.refusal ?? hint,
+        dimmed: new Set(
+          this.targets.flatMap((t, i) =>
+            t.takesWorkspace || (!git && t.available && t.inPlace) ? [] : [i],
+          ),
         ),
-      ),
-    });
+      },
+      this.deps.write,
+    );
   }
 
   private renderSourceStep() {
@@ -566,18 +617,21 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
     const scope = this.listedScope === null ? '' : ` · ${this.listedScope}`;
     const listing = this.listingSeq === null ? null : 'listing… · esc stops';
 
-    drawPicker({
-      title: `spawn: ${this.findSource()?.label ?? ''}${scope}`,
-      items: items.map((item) => item.label),
-      selected: items.length === 0 || items[0]?.notice === true ? -1 : this.selected,
-      input: this.input,
-      hint:
-        this.pending?.label ??
-        this.refusal ??
-        listing ??
-        `type to filter, or a git URL · ↑↓ move · ⏎ select${this.formatTabHint()} · esc back`,
-      dimmed: new Set(items.flatMap((item, i) => (item.notice === true ? [i] : []))),
-    });
+    drawPicker(
+      {
+        title: `spawn: ${this.findSource()?.label ?? ''}${scope}`,
+        items: items.map((item) => item.label),
+        selected: items.length === 0 || items[0]?.notice === true ? -1 : this.selected,
+        input: this.input,
+        hint:
+          this.pending?.label ??
+          this.refusal ??
+          listing ??
+          `type to filter, or a git URL · ↑↓ move · ⏎ select${this.formatTabHint()} · esc back`,
+        dimmed: new Set(items.flatMap((item, i) => (item.notice === true ? [i] : []))),
+      },
+      this.deps.write,
+    );
   }
 
   private renderRefStep() {
@@ -585,16 +639,19 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
 
     this.selected = Math.min(this.selected, Math.max(0, Math.min(items.length, 10) - 1));
 
-    drawPicker({
-      title: `spawn: ref · ${this.repo?.label ?? ''}`,
-      items: items.map((item) => formatRef(item, this.repo?.head ?? null)),
-      selected: items.length === 0 ? -1 : this.selected,
-      input: this.input,
-      hint:
-        this.pending?.label ??
-        this.refusal ??
-        'branch, tag, or full commit id · ↑↓ move · ⏎ select · esc back',
-    });
+    drawPicker(
+      {
+        title: `spawn: ref · ${this.repo?.label ?? ''}`,
+        items: items.map((item) => formatRef(item, this.repo?.head ?? null)),
+        selected: items.length === 0 ? -1 : this.selected,
+        input: this.input,
+        hint:
+          this.pending?.label ??
+          this.refusal ??
+          'branch, tag, or full commit id · ↑↓ move · ⏎ select · esc back',
+      },
+      this.deps.write,
+    );
   }
 
   private renderConfirmStep() {
@@ -606,23 +663,26 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
       refRow = ref.ref === null ? `commit ${ref.sha}` : `${ref.ref} → ${ref.sha.slice(0, 12)}`;
     }
 
-    drawPicker({
-      title: 'spawn: confirm',
-      items: [
-        `source  ${this.repo?.url ?? ''}`,
-        `ref     ${refRow}`,
-        `target  ${target === null ? 'default' : `${target.id} (${target.provider})`}`,
-        `dest    ${this.formatDestination()}`,
-        `agent   ${this.agent}`,
-      ],
-      selected: -1,
-      input: this.input,
-      placeholder:
-        this.autoDestination === null
-          ? 'destination on the target'
-          : 'picked on the target · or type an absolute path',
-      hint: this.refusal ?? 'destination on the target · ⏎ continue · esc back',
-    });
+    drawPicker(
+      {
+        title: 'spawn: confirm',
+        items: [
+          `source  ${this.repo?.url ?? ''}`,
+          `ref     ${refRow}`,
+          `target  ${target === null ? 'default' : `${target.id} (${target.provider})`}`,
+          `dest    ${this.formatDestination()}`,
+          `agent   ${this.agent}`,
+        ],
+        selected: -1,
+        input: this.input,
+        placeholder:
+          this.autoDestination === null
+            ? 'destination on the target'
+            : 'picked on the target · or type an absolute path',
+        hint: this.refusal ?? 'destination on the target · ⏎ continue · esc back',
+      },
+      this.deps.write,
+    );
   }
 
   // The source the flow is on, or null on the local directory flow.
@@ -652,6 +712,8 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
   private applyInput(value: string) {
     // The target step takes no text: its list is short and fixed.
     if (this.step === 'target') {
+      this.deps.log?.('ignored text on the target step');
+
       return;
     }
 
@@ -692,7 +754,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
 
     this.refusal = 'cancelled · esc back';
 
-    process.stdout.write(ansi.clear);
+    this.deps.write(ansi.clear);
     this.render();
   }
 
@@ -758,7 +820,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
       this.step = 'name';
     }
 
-    process.stdout.write(ansi.clear);
+    this.deps.write(ansi.clear);
     this.render();
   }
 
@@ -779,7 +841,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
     this.sourcesPending = false;
     this.step = 'agent';
 
-    process.stdout.write(ansi.clear);
+    this.deps.write(ansi.clear);
     this.render();
   }
 
@@ -787,7 +849,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
   // has one, else to the agent.
   private applySourceCancel() {
     if (this.openTargetStep()) {
-      process.stdout.write(ansi.clear);
+      this.deps.write(ansi.clear);
       this.render();
 
       return;
@@ -804,7 +866,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
     if (!this.isGitFlow()) {
       this.step = 'dir';
 
-      process.stdout.write(ansi.clear);
+      this.deps.write(ansi.clear);
       this.render();
 
       return;
@@ -889,7 +951,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
       return;
     }
 
-    process.stdout.write(ansi.clear);
+    this.deps.write(ansi.clear);
     this.render();
   }
 
@@ -899,7 +961,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
     const typed = this.input.trim();
 
     const chosen =
-      this.collectDirItems()[this.selected] ?? resolvePathInput(typed, process.cwd(), homedir());
+      this.collectDirItems()[this.selected] ?? resolvePathInput(typed, this.deps.cwd, homedir());
 
     if (chosen !== null) {
       this.applyDir(chosen);
@@ -920,7 +982,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
       this.step = 'name';
     }
 
-    process.stdout.write(ansi.clear);
+    this.deps.write(ansi.clear);
     this.render();
   }
 
@@ -957,7 +1019,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
 
     this.step = 'name';
 
-    process.stdout.write(ansi.clear);
+    this.deps.write(ansi.clear);
     this.render();
   }
 
@@ -966,9 +1028,9 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
    * else fuzzy-filters the merged list.
    */
   private collectDirItems(): string[] {
-    return resolvePathInput(this.input, process.cwd(), homedir()) === null
+    return resolvePathInput(this.input, this.deps.cwd, homedir()) === null
       ? pickMatches(this.dirs, this.input)
-      : collectPathCompletions(this.input, process.cwd(), homedir());
+      : collectPathCompletions(this.input, this.deps.cwd, homedir());
   }
 
   // The git source step's rows: the other URL form after a failed probe,
@@ -1029,6 +1091,8 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
     const sources = this.sources ?? [];
 
     if (sources.length < 2) {
+      this.deps.log?.('ignored tab with one source');
+
       return;
     }
 
@@ -1073,6 +1137,8 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
     }
 
     if (this.isStale(generation) || this.pathListingSeq !== seq) {
+      this.deps.onDropAnswer?.('directory listing');
+
       return;
     }
 
@@ -1093,12 +1159,12 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
 
     this.dirLabels = new Map(listed);
 
-    this.dirs = [...new Set([process.cwd(), ...listed.map(([dir]) => dir)])];
+    this.dirs = [...new Set([this.deps.cwd, ...listed.map(([dir]) => dir)])];
     this.input = '';
     this.selected = 0;
     this.step = 'dir';
 
-    process.stdout.write(ansi.clear);
+    this.deps.write(ansi.clear);
     this.render();
   }
 
@@ -1121,7 +1187,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
     }
 
     if (this.openTargetStep()) {
-      process.stdout.write(ansi.clear);
+      this.deps.write(ansi.clear);
       this.render();
 
       return;
@@ -1152,7 +1218,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
       this.listNotice = null;
     }
 
-    process.stdout.write(ansi.clear);
+    this.deps.write(ansi.clear);
     this.render();
 
     // A scope a reading asked for is listed in place of the source's own
@@ -1209,6 +1275,8 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
     }
 
     if (this.isStale(generation) || this.listingSeq !== seq) {
+      this.deps.onDropAnswer?.('listing');
+
       return;
     }
 
@@ -1217,6 +1285,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
     if (this.findSource()?.id !== source.id) {
       this.listingSeq = null;
       this.listedKey = null;
+      this.deps.onDropAnswer?.('listing');
 
       return;
     }
@@ -1242,9 +1311,13 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
     if (this.step === 'source') {
       this.selected = 0;
 
-      process.stdout.write(ansi.clear);
+      this.deps.write(ansi.clear);
       this.render();
+
+      return;
     }
+
+    this.deps.log?.(`kept the ${this.step} step through a listing answer`);
   }
 
   // Takes the git source step's choice: the other URL form on offer, a
@@ -1317,7 +1390,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
 
     this.refusal = `no source reads ${typed} · esc back`;
 
-    process.stdout.write(ansi.clear);
+    this.deps.write(ansi.clear);
     this.render();
   }
 
@@ -1424,6 +1497,8 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
     }
 
     if (this.isStale(generation) || this.pending?.seq !== seq) {
+      this.deps.onDropAnswer?.(kind);
+
       return null;
     }
 
@@ -1452,7 +1527,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
       this.refusal = `${formatError(probed.error)} · esc back`;
       this.input = label;
 
-      process.stdout.write(ansi.clear);
+      this.deps.write(ansi.clear);
       this.render();
 
       return;
@@ -1470,7 +1545,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
     this.ref = null;
 
     this.openRefStep();
-    process.stdout.write(ansi.clear);
+    this.deps.write(ansi.clear);
     this.render();
   }
 
@@ -1501,7 +1576,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
       this.refusal = `${reason} · ${formatError(probed.error)} · esc back`;
     }
 
-    process.stdout.write(ansi.clear);
+    this.deps.write(ansi.clear);
     this.render();
   }
 
@@ -1573,7 +1648,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
       ? `the daemon resolved no commit for ${typed} · esc back`
       : `${formatError(probed.error)} · esc back`;
 
-    process.stdout.write(ansi.clear);
+    this.deps.write(ansi.clear);
     this.render();
   }
 
@@ -1587,7 +1662,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
     this.input = '';
 
     this.openConfirmStep();
-    process.stdout.write(ansi.clear);
+    this.deps.write(ansi.clear);
     this.render();
   }
 
@@ -1764,6 +1839,8 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
     } catch {}
 
     if (this.isStale(generation)) {
+      this.deps.onDropAnswer?.('targets and sources');
+
       return;
     }
 
@@ -1820,10 +1897,12 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
     const zoxide = await collectZoxideDirs();
 
     if (this.isStale(generation)) {
+      this.deps.onDropAnswer?.('local directory listing');
+
       return;
     }
 
-    this.dirs = collectDirs({ cwd: process.cwd(), recent, roots: this.roots, zoxide });
+    this.dirs = collectDirs({ cwd: this.deps.cwd, recent, roots: this.roots, zoxide });
 
     this.dirLabels = new Map();
 
@@ -1832,7 +1911,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
     this.selected = 0;
     this.step = 'dir';
 
-    process.stdout.write(ansi.clear);
+    this.deps.write(ansi.clear);
     this.render();
   }
 
@@ -1882,7 +1961,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
       this.spawnWarnings = warnings.filter((w): w is string => typeof w === 'string');
       this.step = 'spawned';
 
-      process.stdout.write(ansi.clear);
+      this.deps.write(ansi.clear);
       this.render();
 
       return;
@@ -1960,7 +2039,7 @@ export class SpawnPicker<TMirror extends { readonly id: string }> {
       this.input = this.resume ? this.name : prompt;
     }
 
-    process.stdout.write(ansi.clear);
+    this.deps.write(ansi.clear);
     this.render();
   }