sideby 0.2.2 → 0.3.0

package/dist/build.json

@@ -1 +1 @@
-{"id":"20261008T095241-216534"}
+{"id":"20261008T112709-0a27b0"}

package/dist/src/core/config.d.ts

@@ -34,6 +34,7 @@ export declare const ConfigSchema: Type.TObject<{
         noSymlink: Type.TOptional<Type.TBoolean>;
         credential: Type.TOptional<Type.TBoolean>;
     }>>>>;
+    accountTitle: Type.TOptional<Type.TBoolean>;
     resumeRouting: Type.TOptional<Type.TBoolean>;
     shellInitFile: Type.TOptional<Type.TObject<{
         zsh: Type.TOptional<Type.TString>;

package/dist/src/core/config.js

@@ -57,6 +57,9 @@ export const ConfigSchema = Type.Object({
         description: 'Per-Plugin settings; `enabled: false` turns a Plugin off.',
     })),
     extraSharedItems: Type.Optional(Type.Record(Type.String(), Type.Array(SharedItemSchema))),
+    accountTitle: Type.Optional(Type.Boolean({
+        description: 'Set the terminal title to `[<short command or account>]` when sideby starts an Account, and keep Hosts that allow it (Codex) from replacing it. Off by default.',
+    })),
     resumeRouting: Type.Optional(Type.Boolean({
         description: 'Make `sideby shell-init` also define Host-named functions (`claude`, `codex`, `grok`) that resume a session by id in the Account that holds it. Off by default.',
     })),

package/dist/src/core/launch.d.ts

@@ -8,9 +8,11 @@ export interface PreparedLaunch {
     env: Env;
     /** Printed before launching when sign-in happens inside the Host. */
     notice?: string;
+    /** Terminal title set before the Host starts (config `accountTitle`), for example `[codex002]`. */
+    title?: string;
 }
 /** What `runHost` needs: a prepared Account launch, or the Host run unchanged (`sideby resume`). */
-export type HostLaunch = Pick<PreparedLaunch, 'family' | 'bin' | 'args' | 'env'>;
+export type HostLaunch = Pick<PreparedLaunch, 'family' | 'bin' | 'args' | 'env' | 'title'>;
 /** Finds an executable on PATH; returns null when the Host is not installed. */
 export declare function which(bin: string, env: Env): Promise<string | null>;
 /**
@@ -26,6 +28,10 @@ export declare function prepareLaunch(opts: {
     userArgs: readonly string[];
     command: 'run' | 'login';
     bus: HookBus;
+    /** What the Host may show as the Account (`SIDEBY_LABEL`): the short command, else the ref. */
+    label?: string;
+    /** Config `accountTitle`: set the terminal title to `[<label>]` and keep the Host from replacing it. */
+    title?: boolean;
 }): Promise<PreparedLaunch>;
 /**
  * Runs the Host with the terminal attached and returns sideby's exit code (spec §3.5):

package/dist/src/core/launch.js

@@ -34,6 +34,10 @@ export async function prepareLaunch(opts) {
         Object.assign(env, await readSecretFile(account.secretFile, opts.baseEnv));
     if (!account.isMain)
         env[family.selectVar] = account.dir;
+    // Which Account this is, for a status line, prompt or hook to show (spec §3.5); set for every Launch, so a value
+    // inherited from another sideby Launch never leaks through.
+    env.SIDEBY_ACCOUNT = account.ref;
+    env.SIDEBY_LABEL = opts.label || account.ref;
     let args;
     let notice;
     if (opts.command === 'login') {
@@ -47,7 +51,15 @@ export async function prepareLaunch(opts) {
         }
     }
     else {
-        args = [...(family.defaultArgs?.(account, opts.userArgs) ?? []), ...opts.accountArgs, ...opts.userArgs];
+        const keep = opts.title && family.keepTitle && !opts.userArgs.some((a) => a.includes(family.keepTitle.key))
+            ? family.keepTitle.args
+            : [];
+        args = [
+            ...(family.defaultArgs?.(account, opts.userArgs) ?? []),
+            ...keep,
+            ...opts.accountArgs,
+            ...opts.userArgs,
+        ];
     }
     await opts.bus.run('launch.before', family.id, {
         account,
@@ -57,7 +69,19 @@ export async function prepareLaunch(opts) {
         config: {},
         command: opts.command,
     });
-    return { account, family, bin: family.bin, args, env, ...(notice ? { notice } : {}) };
+    // Control characters would end the escape sequence early; labels are shell-safe names, so this is a guard only.
+    const title = opts.title
+        ? [...`[${env.SIDEBY_LABEL ?? account.ref}]`].filter((ch) => ch >= ' ' && ch !== '\x7f').join('')
+        : undefined;
+    return {
+        account,
+        family,
+        bin: family.bin,
+        args,
+        env,
+        ...(notice ? { notice } : {}),
+        ...(title ? { title } : {}),
+    };
 }
 /**
  * Runs the Host with the terminal attached and returns sideby's exit code (spec §3.5):
@@ -67,6 +91,9 @@ export async function prepareLaunch(opts) {
  * default action so Ctrl-Z suspends sideby together with the Host and `fg` resumes both.
  */
 export function runHost(p) {
+    // OSC 0 sets the terminal's tab and window title; only on a terminal, never into a pipe.
+    if (p.title && process.stdout.isTTY)
+        process.stdout.write(`\x1b]0;${p.title}\x07`);
     return new Promise((resolve) => {
         const child = spawn(p.bin, p.args, { stdio: 'inherit', env: p.env });
         const ignore = () => { };

package/dist/src/families/codex/index.js

@@ -47,6 +47,8 @@ export const codexFamily = {
             return [];
         return ['-c', `${FILE_STORE_KEY}="file"`];
     },
+    // `tui.terminal_title` takes only built-in items; an empty list leaves the title sideby set alone.
+    keepTitle: { key: 'tui.terminal_title', args: ['-c', 'tui.terminal_title=[]'] },
     async loginState(account) {
         try {
             return (await stat(join(account.dir, 'auth.json'))).isFile() ? 'logged-in' : 'unknown';

package/dist/src/runtime.js

@@ -1,5 +1,5 @@
 // The one service layer the CLI and the Panel share. Frozen contract for v0.1 (plan: 审核修订).
-import { discoverAccounts, resolveRef } from './core/accounts.js';
+import { aliasesByAccount, discoverAccounts, resolveRef } from './core/accounts.js';
 import { addConfigAlias, aliasAccount, aliasArgs, aliasProblem, aliasRefs, loadConfig, removeConfigAlias, } from './core/config.js';
 import { createAccount } from './core/create.js';
 import { applyFixes, runDoctor } from './core/doctor.js';
@@ -60,6 +60,17 @@ export async function createRuntime(opts = {}) {
         if (f)
             families.set(id, { ...f, sharedItems: [...f.sharedItems, ...extra] });
     }
+    /**
+     * `SIDEBY_LABEL` for a Launch: the alias it was started through; else the Account's aliases, those without Host
+     * arguments first, then by name; else the ref.
+     */
+    const launchLabel = (ref, account, all) => {
+        if (!ref.includes(':') && ownAlias(ref) !== undefined)
+            return ref;
+        const names = aliasesByAccount(aliasRefs(config.aliases), all).get(account.ref) ?? [];
+        const plain = names.filter((n) => aliasArgs(ownAlias(n)).length === 0);
+        return plain[0] ?? names[0] ?? account.ref;
+    };
     const accounts = async () => {
         const out = [];
         for (const f of families.values())
@@ -338,8 +349,11 @@ export async function createRuntime(opts = {}) {
             return out;
         },
         async prepareLaunch(ref, userArgs, command) {
-            const account = resolveRef(ref, await accounts(), aliasRefs(config.aliases));
+            const all = await accounts();
+            const account = resolveRef(ref, all, aliasRefs(config.aliases));
             return prepareLaunch({
+                label: launchLabel(ref, account, all),
+                title: config.accountTitle === true,
                 account,
                 family: familyOf(account.family),
                 baseEnv: env,

package/dist/src/types.d.ts

@@ -67,6 +67,14 @@ export interface FamilyDef {
     };
     /** Arguments sideby adds before the Account's and the user's arguments. */
     defaultArgs?(account: Account, userArgs: readonly string[]): string[];
+    /**
+     * Host arguments that stop the Host from setting the terminal title for this run, so the title sideby sets with
+     * config `accountTitle` (`[<SIDEBY_LABEL>]`) stays. Added after `defaultArgs`, unless a user argument contains `key`.
+     */
+    keepTitle?: {
+        args: string[];
+        key: string;
+    };
     loginState?(account: Account): Promise<LoginState>;
     model?(account: Account): Promise<string | undefined>;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sideby",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "Run every AI coding account side by side: Claude Code, Codex, Grok and pi, with one shared config and a quota panel.",
   "license": "MIT",
   "type": "module",

package/schemas/config.json

@@ -145,6 +145,10 @@
         }
       }
     },
+    "accountTitle": {
+      "type": "boolean",
+      "description": "Set the terminal title to `[<short command or account>]` when sideby starts an Account, and keep Hosts that allow it (Codex) from replacing it. Off by default."
+    },
     "resumeRouting": {
       "type": "boolean",
       "description": "Make `sideby shell-init` also define Host-named functions (`claude`, `codex`, `grok`) that resume a session by id in the Account that holds it. Off by default."

package/skills/sideby/SKILL.md

@@ -1,8 +1,8 @@
 ---
 name: sideby
-description: Use when the user runs, or wants to run, several AI coding accounts (Claude Code, Codex, Grok Build, pi) side by side. Covers installing sideby and setting up a new account ("install sideby", "set up another Claude account", "add cc008", "配置一个 cc00x", "再加一个 Codex 账号"), explaining what accounts share and what stays separate ("what do my accounts share?", "这些账号共享了什么"), seeing accounts, quota and usage, moving on when one hits its 5-hour or weekly limit, adding a short command (alias), and repairing drifted account directories (skills, hooks, rules or settings not shared, wrong symlinks, credential file permissions). Drives the `sideby` CLI with `--json`; the agent does every step except browser sign-in, filling in secrets and starting interactive sessions, which it hands to the user as one command.
+description: Use when the user runs, or wants to run, several AI coding accounts (Claude Code, Codex, Grok Build, pi) side by side. Covers installing sideby and setting up a new account ("install sideby", "set up another Claude account", "add cc008", "配置一个 cc00x", "再加一个 Codex 账号"), explaining what accounts share and what stays separate ("what do my accounts share?", "这些账号共享了什么"), showing which account a session is ("show [cc001] in the status line", "加上账号标识"), seeing accounts, quota and usage, moving on when one hits its 5-hour or weekly limit, adding a short command (alias), and repairing drifted account directories (skills, hooks, rules or settings not shared, wrong symlinks, credential file permissions). Drives the `sideby` CLI with `--json`; the agent does every step except browser sign-in, filling in secrets and starting interactive sessions, which it hands to the user as one command.
 metadata:
-  version: "0.2.2"
+  version: "0.3.0"
   requires:
     bins: [sideby, node]
   cliHelp: sideby --help
@@ -37,6 +37,7 @@ Account refs are `<family>:<name>`; a bare `<name>` works only when it is unique
 | The user wants to | Run | Then read |
 |---|---|---|
 | Install sideby, or set up a new account ("add cc008") | `sideby --version`, `sideby list --json`, `sideby new <family> --next --json` | `references/setup.md` |
+| Show which account a session is (`[cc001]` in the status line or tab title) | `sideby list --json` for the labels | `references/badge.md` |
 | Know what accounts share and what stays separate | `sideby families <family> --json` | `references/sharing.md` |
 | See accounts, health, quota and usage | `sideby list --json`, `sideby doctor --json`, `sideby quota --json` | `references/diagnose.md` |
 | Repair drift or permissions | `sideby doctor [ref] --json`, then `--fix` after they agree | `references/diagnose.md` |

package/skills/sideby/references/badge.md

@@ -0,0 +1,31 @@
+# Show which account a session is
+
+For "show the account in the status line", "加上 [cc001] 这个标识". sideby sets `SIDEBY_ACCOUNT` (`claude:001`) and `SIDEBY_LABEL` (`cc001`, the short command, else the ref) for every account it starts. Configure each Host the user runs; tell them what you change. Always check the family prefix of `SIDEBY_ACCOUNT`, because a Host started inside another inherits both variables.
+
+## Claude Code: status line
+
+1. Read `statusLine` in `~/.claude/settings.json` (linked, so one edit covers every account). Do not touch the env section or anything else in it.
+2. If `command` is `sideby statusline-tap --orig-b64 <base64>`, the real script is the base64-decoded original: edit that script, never the wrapper.
+3. If there is a script, add before its first output: `case "${SIDEBY_ACCOUNT-}" in claude:*) printf '[%s] ' "$SIDEBY_LABEL" ;; esac`. Keep the rest.
+4. If there is no status line: write `~/.claude/statusline.sh` (badge, then `jq -r '.model.display_name // empty'` from stdin), `chmod +x` it, and set `"statusLine": { "type": "command", "command": "~/.claude/statusline.sh" }`. When quota setup was already on with no original command, run `sideby quota teardown claude` first and `sideby quota setup claude` again after (it exits 10; get the user's yes before `--yes`).
+
+## Grok Build: status line
+
+1. Write `~/.grok/statusline.sh`, `chmod +x`: badge from `SIDEBY_LABEL` when `SIDEBY_ACCOUNT` is `grok:*`, else the `GROK_HOME` directory name; then `jq -r` of `.workspace.current_dir`, `.model.display_name` and `.context_window.used_percentage` from stdin, because `type = "command"` replaces the built-in row.
+2. In `~/.grok/config.toml`, after the `[ui]` keys, add:
+
+   ```toml
+   [ui.status_line]
+   type = "command"
+   command = "~/.grok/statusline.sh"
+   ```
+
+   Never add a second `[ui]` table; if `[ui.status_line]` exists, change it.
+3. `sideby doctor grok --fix` copies `config.toml` to subscription accounts (it must be a real copy there). API accounts (`kind: "api"`) keep their own `config.toml`: add the same table to each.
+4. `GROK_HOME=<dir> grok inspect` must not report the new keys as unrecognized. It takes effect in a new Grok session.
+
+## Codex: terminal tab title
+
+Codex's status line and title accept only built-in items, so the badge goes in the tab title. Set `"accountTitle": true` in `~/.config/sideby/config.json`, keeping every other key. sideby then sets the title to `[codex002]` at launch and starts Codex with `-c tui.terminal_title=[]` so Codex keeps it; the title no longer shows Codex's own spinner. Check `sideby --version` first: it must be 0.3.0 or later. An older sideby rejects the unknown key and then every sideby command and short command fails; upgrade with `npm i -g sideby` before adding it.
+
+Finish by telling the user to start a new session (`cc001`, `grok001`, `codex002`) to see it.

package/skills/sideby/references/setup.md

@@ -15,8 +15,9 @@ For "install sideby", "set up another Claude account", "add cc008", "配置一
    - Subscription account: `sideby login <ref>`. It opens the Host's sign-in in their browser. For pi it starts pi; they type `/login`.
    - API account: they open the `proxy.env` path that `new` printed and fill in the values. Never read or write it, and never ask for the key in chat.
 7. **Short command in new terminals.** If `~/.config/sideby/config.json` has no `shellInitFile`, and `~/.zshrc` (bash: `~/.bashrc`) has no line containing `sideby shell-init`, say so and append `eval "$(sideby shell-init zsh)"` (or `bash`). It takes effect in new terminals. Skip this when the user wanted no short command.
-8. **Verify.** `sideby doctor <ref> --json` should report no `fail`; fix only the new account with `sideby doctor <ref> --fix`. After the user signed in, `sideby list --json` shows `login: "logged-in"` for it.
-9. **Optional, Claude Code:** for quota in `sideby quota` and the panel, follow `quota.md` (it needs the user's yes).
+8. **Account badge.** Offer to show which account each session is (`[cc008]` in the status line or tab title); if they want it, follow `badge.md`.
+9. **Verify.** `sideby doctor <ref> --json` should report no `fail`; fix only the new account with `sideby doctor <ref> --fix`. After the user signed in, `sideby list --json` shows `login: "logged-in"` for it.
+10. **Optional, Claude Code:** for quota in `sideby quota` and the panel, follow `quota.md` (it needs the user's yes).
 
 Finish with how to start it: the short command in a new terminal (`cc008`), or `sideby run <ref>`; and `sideby ui` to see every account's quota.