@shardflux/cli 0.25.0 → 0.28.1

package/dist/t3-provider.js

@@ -3,13 +3,15 @@ import { homedir } from 'node:os';
 import { dirname, join } from 'node:path';
 import { writePrivateFile } from "./credentials.js";
 import { withTargetLock } from "./target-lock.js";
-import { installedTargets } from "./agent-targets.js";
+import { applicationDirs, t3Apps } from "./agent-targets.js";
 import { t3ArchiveSupportsAcp } from "./t3-asar.js";
 const ID = 'shardflux';
 const provider = { driver: 'acpRegistry', displayName: 'Shardflux', enabled: true, config: { source: 'local', commandPath: 'shard', commandArgs: ['acp'] } };
 /** Every shard invocation registers the one installed T3 provider without adding terminal noise (macOS and Linux). */
 export async function registerInstalledT3(env, dir, signal, platform = process.platform) {
-    if (!installedTargets(env, platform).targets.includes('t3'))
+    // Registration only needs T3 presence; probing other apps or choosing a
+    // preferred T3 version would inspect unrelated bundles on every command.
+    if (!t3Apps(applicationDirs(env, platform), platform, env).length)
         return;
     try {
         await configureT3Provider(env, dir, false, signal);

package/dist/task-land-hub.py

@@ -11,7 +11,10 @@ Input: one JSON object on stdin. Output: one JSON object on stdout (exit 0; "sta
   title     for the merge commit's message
 
 The result commit T lands in the default branch D: a fast-forward when D is an ancestor of T, nothing when T is already
-in D, else a merge commit when the merge is clean (a conflict: state "conflict", stage "default"; nothing changes). The
+in D, else a merge commit when the merge is clean (a conflict: state "conflict", stage "default"; nothing changes).
+Commits with no history in common (a result started from another repository than the one D holds, or two workers from
+different repositories) never merge: state "unrelated" with its stage, nothing changes. Unlike a conflict it does not
+clear by trying again. The
 hub's branches move only by `git push` from a temporary repository, never by force, so a branch someone else moved
 meanwhile is refused (stage "raced") instead of overwritten. Before answering "landed" it checks on the hub itself that
 T is contained in D, and which sources are contained in T.
@@ -55,6 +58,11 @@ def ancestor(cwd, a, b):
     return git(cwd, 'merge-base', '--is-ancestor', a, b, ok=(0, 1)).returncode == 0
 
 
+def related(cwd, a, b):
+    """Whether a and b have any history in common (git finds a merge base)."""
+    return git(cwd, 'merge-base', a, b, ok=(0, 1)).returncode == 0
+
+
 def merge(repo, ours, theirs, message):
     """A merge commit of theirs into ours when the merge is clean, else (None, conflicting paths)."""
     r = git(repo, 'merge-tree', '--write-tree', '--name-only', '--no-messages', '-z', ours, theirs, ok=(0, 1))
@@ -107,6 +115,8 @@ def land(a):
                 if not t or ancestor(work, t, st):
                     t = st
                 elif not ancestor(work, st, t):
+                    if not related(work, t, st):
+                        return {'state': 'unrelated', 'stage': 'integrate', 'into': into, 'source': s}
                     t, conflicts = merge(work, t, st, 'Merge %s into %s' % (s, result))
                     if not t:
                         return {'state': 'conflict', 'stage': 'integrate', 'into': into, 'source': s, 'conflicts': conflicts}
@@ -120,6 +130,11 @@ def land(a):
         elif not before or ancestor(work, before, t):
             method, after = ('created' if not before else 'ff'), t
         else:
+            if not related(work, before, t):
+                # Another repository's branch (a project's hub holds every folder its people linked): the result still
+                # lands in its own folder; the sources it holds say which workers' work that is.
+                contained = [s for s in sources if have.get(s) and ancestor(work, have[s], t)]
+                return {'state': 'unrelated', 'stage': 'default', 'into': into, 'result': t, 'before': before, 'contained': contained}
             after, conflicts = merge(work, before, t, 'Land %s (%s)' % (title, result))
             if not after:
                 return {'state': 'conflict', 'stage': 'default', 'into': into, 'result': t, 'before': before, 'conflicts': conflicts}

package/dist/this-computer.d.ts

@@ -4,8 +4,10 @@ export declare const yourComputer: (platform?: NodeJS.Platform) => string;
 export declare const LINUX_DEFAULT_SHORTCUT = "<Alt><Shift>space";
 /** A GTK accelerator ("<Control><Shift>space") as the Linux app shows it ("Ctrl+Shift+Space"); shortcutLabel in its core.mjs. */
 export declare function acceleratorLabel(accelerator: string): string;
+/** An Electron accelerator ("Alt+Shift+Space", the one app's desktop-app.json) as the person reads it. */
+export declare function electronAcceleratorLabel(accelerator: string, platform: NodeJS.Platform): string;
 /**
- * The launcher's shortcut as the person presses it: ⌥⇧Space on macOS (the menu bar's), the Linux app's configured one
- * on Linux, undefined elsewhere.
+ * The launcher's shortcut as the person presses it: the one app's (desktop-app.json in the config directory, 0.27.0+),
+ * else ⌥⇧Space on macOS (the menu bar app's) and the Linux app's configured one on Linux; undefined elsewhere.
  */
 export declare function launcherShortcut(configDir: string, platform?: NodeJS.Platform): string | undefined;

package/dist/this-computer.js

@@ -16,11 +16,29 @@ export function acceleratorLabel(accelerator) {
     const key = accelerator.replace(/<\w+>/g, '');
     return [...mods, key.length === 1 ? key.toUpperCase() : key.charAt(0).toUpperCase() + key.slice(1)].join('+');
 }
+/** An Electron accelerator ("Alt+Shift+Space", the one app's desktop-app.json) as the person reads it. */
+export function electronAcceleratorLabel(accelerator, platform) {
+    const parts = accelerator.split('+');
+    const key = parts.pop() ?? '';
+    if (platform === 'darwin') {
+        const symbols = { Control: '⌃', Ctrl: '⌃', Alt: '⌥', Option: '⌥', Shift: '⇧', Command: '⌘', Cmd: '⌘', CommandOrControl: '⌘', CmdOrCtrl: '⌘' };
+        const order = ['⌃', '⌥', '⇧', '⌘'];
+        return parts.map(p => symbols[p] ?? p).sort((a, b) => order.indexOf(a) - order.indexOf(b)).join('') + key;
+    }
+    const names = { Control: 'Ctrl', CommandOrControl: 'Ctrl', CmdOrCtrl: 'Ctrl', Command: 'Super', Cmd: 'Super', Super: 'Super', Meta: 'Super' };
+    return [...parts.map(p => names[p] ?? p), key].join('+');
+}
 /**
- * The launcher's shortcut as the person presses it: ⌥⇧Space on macOS (the menu bar's), the Linux app's configured one
- * on Linux, undefined elsewhere.
+ * The launcher's shortcut as the person presses it: the one app's (desktop-app.json in the config directory, 0.27.0+),
+ * else ⌥⇧Space on macOS (the menu bar app's) and the Linux app's configured one on Linux; undefined elsewhere.
  */
 export function launcherShortcut(configDir, platform = process.platform) {
+    try {
+        const app = JSON.parse(readFileSync(join(configDir, 'desktop-app.json'), 'utf8'));
+        if (typeof app.launcher_shortcut === 'string' && /^([A-Za-z]+\+)+\S+$/.test(app.launcher_shortcut) && (platform === 'darwin' || platform === 'linux'))
+            return electronAcceleratorLabel(app.launcher_shortcut, platform);
+    }
+    catch { /* the app has not written it (an older app, or none) */ }
     if (platform === 'darwin')
         return '⌥⇧Space';
     if (platform !== 'linux')

package/dist/thread-on-computer.js

@@ -19,7 +19,7 @@ import { cloudClaudeLogin, loginClaudeInWorkspace, requireClaudeTerminal } from
 import { promptWithImages, readInitialImages, readInitialPrompt, uploadInitialImages } from "./initial-prompt.js";
 import { recordSeedSnapshot } from "./files-mirror.js";
 import { ensureCodexCloud, printCloudThread, submitCloudInitialPrompt } from "./codex-cloud.js";
-import { modelChoice } from "./agent-models.js";
+import { liveModels, modelChoice } from "./agent-models.js";
 import { storedTitlePrefix } from "./client-settings.js";
 const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 const SHA = /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/;
@@ -143,7 +143,7 @@ export async function startThreadOn(ctx, values, path, explicitApp) {
     const review = values.review === true;
     if (review && app === 'codex')
         throw new UsageError('--review starts a read-only Claude reviewer. A Codex thread on a computer works on its own branch; omit --review.');
-    const choice = modelChoice(values, app);
+    const choice = modelChoice(values, app, await liveModels(ctx, values, app));
     const name = str(values.name);
     if (name !== undefined && !/^[a-z0-9][a-z0-9-]{0,47}$/.test(name))
         throw new UsageError('--name must match ^[a-z0-9][a-z0-9-]{0,47}$');

package/dist/timing.js

@@ -53,13 +53,15 @@ export class TimingRecorder {
         return own && own.action !== 'token' ? own : this.last;
     }
 }
-/** A resume that booted the saved disk: files as of the suspend, every process restarted (never a null memory_restored). */
+/** A resume that booted its disk: files kept, every process restarted (never a null memory_restored). */
 function restartedProcesses(t) {
     return t.server?.resumePath === 'cold_boot' && t.server.memoryRestored === false;
 }
 /** Cold boot reasons the notice says in words (0.8.1+); any other reason is printed as the API sent it. */
 const COLD_BOOT_WORDS = {
     host_lost: 'the machine it ran on failed',
+    guest_unresponsive: 'the guest did not become ready after bounded restore attempts',
+    guest_filesystem: 'the filesystem was repaired offline',
 };
 /**
  * The one-line stderr notice after a command whose resume booted the workspace's saved disk (0.6.0+), with or without

package/dist/transcribe-commands.js

@@ -5,10 +5,10 @@
  */
 import { readFile } from 'node:fs/promises';
 import { extname } from 'node:path';
-import { audioFormatOf } from '@shardflux/sdk';
+import { ShardfluxApiError, audioFormatOf } from '@shardflux/sdk';
 import { out, str } from "./commands.js";
 import { EXIT, UsageError } from "./errors.js";
-import { inScope } from "./router-commands.js";
+import { inScope } from "./person-scope.js";
 /** What one transcription holds (the API's bound; past it the rest is not transcribed and `truncated` says so). */
 export const TRANSCRIBE_MAX_BYTES = 6 * 1024 * 1024;
 const FORMATS = ['webm', 'wav', 'pcm16'];
@@ -74,6 +74,10 @@ export const TRANSCRIBE_HANDLERS = {
         catch (err) {
             if (ctx.signal.aborted)
                 return EXIT.interrupted;
+            if (err instanceof ShardfluxApiError && err.reason === 'cloud_transcription_off') {
+                ctx.io.stderr.write('Cloud transcription is not on for this organization (cloud_transcription_off).\n');
+                return EXIT.error;
+            }
             throw err;
         }
     },

package/dist/update.js

@@ -18,12 +18,14 @@ import { AgentStateStore } from "./agent-state.js";
 import { writePrivateFile } from "./credentials.js";
 import { CodedError } from "./errors.js";
 import { json } from "./format.js";
+import { macAppPackage, ONE_APP_ON_MAC } from "./mac-app.js";
 import { compareAppVersions, MenubarManager, packagedAppPath } from "./menubar.js";
 export const INSTALL_FILE = 'install.json';
 export const LAST_UPDATE_FILE = 'last-update.json';
 const LOCK_FILE = 'update.lock';
 const MCP = '@shardflux/mcp';
-const MENUBAR = '@shardflux/menubar-darwin';
+/** The npm package of the macOS app on this Mac: the menu bar app, or the one Shardflux app once it takes over. */
+const MENUBAR = macAppPackage();
 /** Finds the package directory of `pkg` above `script` and how it was installed. */
 export function detectInstall(script, pkg, platform = process.platform) {
     let real = script;
@@ -100,7 +102,7 @@ export function displayCommand(install, specs) {
 }
 /** Prefixes can contain spaces, quotes or shell substitutions. The actual install still uses argv. */
 const shellQuote = (value) => `'${value.replaceAll("'", "'\\''")}'`;
-const LABELS = { shardflux: 'shardflux', '@shardflux/cli': 'shard', '@shardflux/sdk': 'SDK', [MENUBAR]: 'menu bar', [MCP]: 'MCP server' };
+const LABELS = { shardflux: 'shardflux', '@shardflux/cli': 'shard', '@shardflux/sdk': 'SDK', [MENUBAR]: ONE_APP_ON_MAC ? 'Shardflux app' : 'menu bar', [MCP]: 'MCP server' };
 /** Every local piece and its status against the catalog. */
 export async function components(ctx, install, catalog, menubar = menubarManager(ctx)) {
     const local = [[ctx.distribution.package, ctx.distribution.version]];

package/dist/wait-status.d.ts

@@ -14,7 +14,7 @@ export declare function queueLine(e: Pick<Extract<ProgressEvent, {
     type: 'phase';
 }>, 'queuePosition' | 'scaleOut' | 'expectedReadyBy' | 'deadlineAt'>): string;
 /** A call waiting to be admitted, in words. */
-export declare function admissionLine(r: Pick<RetryRecord, 'reason' | 'queuePosition'>): string;
+export declare function admissionLine(r: Pick<RetryRecord, 'reason' | 'queuePosition' | 'retryAfterSeconds'>): string;
 /**
  * The client listener that prints where a wait stands. Silent with `json`. A phase other than capacity_pending ends
  * the queue, so a later queue prints again.

package/dist/wait-status.js

@@ -17,6 +17,8 @@ export function queueLine(e) {
 /** A call waiting to be admitted, in words. */
 export function admissionLine(r) {
     const position = r.queuePosition ? ` (position ${r.queuePosition})` : '';
+    if (r.reason === 'admission_queued')
+        return `queued for admission${position}${r.retryAfterSeconds != null ? `; retrying in ${r.retryAfterSeconds} s` : ''}`;
     if (r.reason === 'host_capacity')
         return `waiting for room on the workspace's host${position}`;
     if (r.reason === 'concurrent_workspaces')

package/dist/worktree-twin-engine.d.ts

@@ -123,7 +123,7 @@ export declare function runTwinLoop(deps: LoopDeps, signal: AbortSignal): Promis
  * A VM of the project that reads the project hub: an awake one reads it without waking anything; else the project's
  * small space reader (woken). The twin lands from it when a conversation's VM is gone; `shard task land` merges there.
  */
-export declare function projectHubCell(ctx: Ctx, projectId: string, signal?: AbortSignal, agentLabel?: string): Promise<{
+export declare function projectHubCell(ctx: Ctx, projectId: string, signal?: AbortSignal, agentLabel?: string, workspaceIds?: readonly string[]): Promise<{
     cell: TwinCell;
     close(): void;
 }>;

package/dist/worktree-twin-engine.js

@@ -508,14 +508,17 @@ const openCell = (ws, agentLabel) => {
  * A VM of the project that reads the project hub: an awake one reads it without waking anything; else the project's
  * small space reader (woken). The twin lands from it when a conversation's VM is gone; `shard task land` merges there.
  */
-export async function projectHubCell(ctx, projectId, signal, agentLabel = 'shard-twin') {
+export async function projectHubCell(ctx, projectId, signal, agentLabel = 'shard-twin', workspaceIds) {
     const client = conversationClient(ctx);
-    const all = (await listConversations(ctx, projectId)).filter(c => !ended(c))
-        .sort((a, b) => (b.last_activity_at ?? '').localeCompare(a.last_activity_at ?? ''));
-    for (const c of all) {
+    // A manual landing uses its own result's computer. Borrowing an unrelated thread races that person's deletion:
+    // staging 2026-10-17 cut off a real landing when a newer home thread's VM was deleted. If the result's computers
+    // are gone or asleep, the persistent space reader owns the operation instead; do not wake a finished agent.
+    const ids = workspaceIds ?? (await listConversations(ctx, projectId)).filter(c => !ended(c))
+        .sort((a, b) => (b.last_activity_at ?? '').localeCompare(a.last_activity_at ?? '')).map(c => c.workspace_id);
+    for (const id of new Set(ids)) {
         try {
-            const ws = await client.workspaces.get(c.workspace_id);
-            if (!ws.data.deleted_at && ws.ready)
+            const ws = await client.workspaces.get(id);
+            if (ws.data.project_id === projectId && !ws.data.deleted_at && ws.ready)
                 return openCell(ws, agentLabel);
         }
         catch { /* another may be awake */ }
@@ -624,7 +627,7 @@ export const TWIN_HANDLERS = {
             ledger.setMode(project, action);
         }
         const mode = ledger.mode(project);
-        const text = mode === 'auto' ? 'Finished conversations land in your local branch automatically.' : mode === 'pr' ? 'Finished conversations open a pull request instead of landing locally.' : 'Automatic landing is off for this project.';
+        const text = !ledger.autoLand() ? 'Automatic landing is off on this computer: shard settings --auto-land on turns it back on.' : mode === 'auto' ? 'Finished conversations land in your local branch automatically.' : mode === 'pr' ? 'Finished conversations open a pull request instead of landing locally.' : 'Automatic landing is off for this project.';
         out(ctx, `${text}\n`, { project_id: project, landing: mode });
         return 0;
     },

package/dist/worktree-twin.d.ts

@@ -265,7 +265,9 @@ export interface TwinConversationState {
     last_error?: string;
     latency_ms?: number;
 }
+/** `auto_land: false` (`shard settings --auto-land off`, the desktop app's Settings switch): nothing lands on this computer. */
 interface TwinDoc {
+    auto_land?: boolean;
     landing?: Record<string, LandingMode>;
     conversations?: Record<string, TwinConversationState>;
 }
@@ -273,8 +275,12 @@ export declare class TwinLedger {
     readonly store: AgentStateStore;
     constructor(dir: string);
     read(): TwinDoc;
+    /** The project's landing, 'off' everywhere while this computer's switch is off. */
     mode(project: string): LandingMode;
     setMode(project: string, mode: LandingMode): void;
+    /** This computer's switch for every project (on unless turned off). */
+    autoLand(): boolean;
+    setAutoLand(on: boolean): void;
     conversation(id: string): TwinConversationState;
     patch(id: string, change: Partial<TwinConversationState>): void;
     forget(id: string): void;

package/dist/worktree-twin.js

@@ -726,8 +726,15 @@ export class TwinLedger {
     store;
     constructor(dir) { this.store = new AgentStateStore(dir); }
     read() { return this.store.read().worktree_twin ?? {}; }
-    mode(project) { return this.read().landing?.[project] ?? 'auto'; }
+    /** The project's landing, 'off' everywhere while this computer's switch is off. */
+    mode(project) { const doc = this.read(); return doc.auto_land === false ? 'off' : doc.landing?.[project] ?? 'auto'; }
     setMode(project, mode) { this.update(doc => { doc.landing = { ...doc.landing, [project]: mode }; }); }
+    /** This computer's switch for every project (on unless turned off). */
+    autoLand() { return this.read().auto_land !== false; }
+    setAutoLand(on) { this.update(doc => { if (on)
+        delete doc.auto_land;
+    else
+        doc.auto_land = false; }); }
     conversation(id) { return this.read().conversations?.[id] ?? {}; }
     patch(id, change) {
         this.update(doc => { doc.conversations = { ...doc.conversations, [id]: { ...doc.conversations?.[id], ...change } }; });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shardflux/cli",
-  "version": "0.25.0",
+  "version": "0.28.1",
   "type": "module",
   "description": "shard: the Shardflux command line. Create an account, sign in, set up keys and billing, then open, run commands in, move files to, suspend, resume and fork serverless agent workspaces.",
   "license": "Apache-2.0",
@@ -31,7 +31,12 @@
       "import": "./dist/index.js",
       "default": "./dist/index.js"
     },
-    "./bin": "./dist/bin.js"
+    "./bin": "./dist/bin.js",
+    "./main": {
+      "types": "./dist/main.d.ts",
+      "import": "./dist/main.js",
+      "default": "./dist/main.js"
+    }
   },
   "files": [
     "dist",
@@ -48,7 +53,7 @@
     "snappyjs": "0.7.0",
     "ws": "8.22.0",
     "yaml": "2.9.1",
-    "@shardflux/sdk": "^0.28.0"
+    "@shardflux/sdk": "^0.30.1"
   },
   "devDependencies": {
     "@eslint/js": "10.0.1",
@@ -60,9 +65,10 @@
     "typescript-eslint": "8.70.1"
   },
   "optionalDependencies": {
-    "@shardflux/desktop-linux-arm64": "0.1.12",
-    "@shardflux/desktop-linux-x64": "0.1.12",
-    "@shardflux/menubar-darwin": "^0.8.6"
+    "@shardflux/desktop-darwin-arm64": "0.9.2",
+    "@shardflux/desktop-darwin-x64": "0.9.2",
+    "@shardflux/desktop-linux-arm64": "0.9.2",
+    "@shardflux/desktop-linux-x64": "0.9.2"
   },
   "scripts": {
     "build": "node scripts/build.mjs",