dsh-ssh-tui 0.7.2 → 0.7.4

package/lib/question-wait.js

@@ -0,0 +1,418 @@
+/**
+ * What a question does while nobody is attached to answer it.
+ *
+ * A dropped SSH link leaves the question queued in memory, and the only trace of
+ * it used to be a transcript line written *after* the user reconnected — which is
+ * how a turn spent waiting for an answer went unnoticed until then. Two signals
+ * exist before that:
+ *
+ * - a marker file under `$DSH_HOME/tui-socks/`, so logging back into the jump
+ *   host shows a session waiting on an answer before the TUI is even open;
+ * - one command the user configured, run once, carrying the question in its
+ *   environment. Mail and WeCom are presets of that command rather than clients
+ *   of their own: a jump host has whichever of them it already has, and neither
+ *   belongs in this plugin's dependency tree.
+ * @module dsh-ssh-tui/question-wait
+ */
+import { spawn } from 'node:child_process';
+import { mkdir, unlink, writeFile } from 'node:fs/promises';
+import { basename, dirname, join } from 'node:path';
+import { sessionErrPath, sessionSockDir } from './display-sock.js';
+import { t } from './i18n/index.js';
+import { restrictPathToUser } from './platform.js';
+/** How long a notify command may run before it is killed. It must not stall the turn. */
+const NOTIFY_TIMEOUT_MS = 10_000;
+/**
+ * The marker for one session.
+ *
+ * Beside the session's stderr log, under the same digested label, so a long id
+ * stays inside a Windows path and two ids that sanitize to the same stem do not
+ * share a file. `.waiting` rather than a dotfile: the point is that `ls` shows it.
+ * @param sessionId - the session that is waiting.
+ * @param dshHome - the harness home; defaults to the process one.
+ * @returns the marker path.
+ */
+export function waitingMarkerPath(sessionId, dshHome) {
+    const dir = dshHome === undefined ? sessionSockDir() : sessionSockDir(dshHome);
+    const err = dshHome === undefined ? sessionErrPath(sessionId) : sessionErrPath(sessionId, dshHome);
+    // The stderr log's own stem, so the marker can never drift onto a name that
+    // log does not already occupy. `basename` and `join` carry the separators of
+    // the running platform, so the marker is a real sibling on Windows too rather
+    // than a mixed `\\dir/name` — which is what hand-splitting on `/` produced.
+    return join(dir, `${basename(err, '.err')}.waiting`);
+}
+/**
+ * Write the marker, replacing one already there.
+ *
+ * The question text is the only sensitive part, so the file is owner-only. A
+ * failure to write is reported as `false` and never thrown: the question is
+ * still queued, and a marker is not worth failing it over.
+ *
+ * Deliberately a plain `writeFile`, not a staged sibling renamed into place.
+ * The rename is atomic on POSIX, but Windows refuses to replace a file another
+ * process has open — and the whole point of this marker is that something else
+ * polls it (a jump-host `cat` in a loop), so the "atomic" version stops updating
+ * exactly while it is being read. The cost of the plain write is a window
+ * between the create and the first byte where a reader sees an empty file; the
+ * marker is rewritten on every change, so that window is what a consumer has to
+ * tolerate rather than something the writer can hide.
+ * @param question - the question that just started waiting.
+ * @param dshHome - the harness home; defaults to the process one.
+ * @returns whether the marker is on disk.
+ */
+export async function writeWaitingMarker(question, dshHome) {
+    const path = waitingMarkerPath(question.sessionId, dshHome);
+    const body = [
+        `session=${question.sessionId}`,
+        `waiting=${question.count}`,
+        `since=${new Date(question.since).toISOString()}`,
+        `question=${question.question.replaceAll('\n', ' ')}`,
+        '',
+    ].join('\n');
+    try {
+        await mkdir(dirname(path), { recursive: true });
+        await restrictPathToUser(dirname(path), { mode: 0o700, directory: true });
+        await writeFile(path, body, { mode: 0o600 });
+        await restrictPathToUser(path, { mode: 0o600 });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Remove the marker. Missing is fine: the question may have been answered, or
+ * the marker may never have been written.
+ * @param sessionId - the session whose wait ended.
+ * @param dshHome - the harness home; defaults to the process one.
+ */
+export async function clearWaitingMarker(sessionId, dshHome) {
+    try {
+        await unlink(waitingMarkerPath(sessionId, dshHome));
+    }
+    catch {
+        // Already gone, or never written.
+    }
+}
+/**
+ * The command to run when a question starts waiting, if the user configured one.
+ *
+ * The environment wins over settings, the same order `/disconnect` uses, so a
+ * one-off invocation can point somewhere else without editing the profile.
+ * Empty and whitespace are "not configured".
+ * @param env - the process environment.
+ * @param saved - the `ssh-tui.notify` value, when settings has one.
+ * @returns the command, or undefined when notifications are off.
+ */
+export function notifyCommand(env = process.env, saved) {
+    const fromEnv = (env.DSH_TUI_NOTIFY ?? '').trim();
+    if (fromEnv !== '')
+        return fromEnv;
+    const fromSaved = (saved ?? '').trim();
+    return fromSaved === '' ? undefined : fromSaved;
+}
+const SMTP_PORT_DEFAULT = 587;
+const LOCAL_PORT_DEFAULT = 25;
+/**
+ * Parse one `/notify` argument into a target.
+ *
+ * Four shapes, deliberately small:
+ *
+ * - empty, `off`, `none` — turn it off;
+ * - `mail you@example.com` — the local mailer;
+ * - `smtp host[:port] from to [user [password]]` — an SMTP server, port 587
+ *   when omitted, authenticated only when a user is given;
+ * - `local [port] from to` — the machine's own mailer on 25, or another port.
+ *
+ * @param raw - everything after `/notify`.
+ * @returns the target, or undefined when the shape is not one of those.
+ */
+export function parseNotifyTarget(raw) {
+    const parts = raw.trim().split(/\s+/u).filter(part => part !== '');
+    if (parts.length === 0)
+        return { kind: 'off' };
+    const head = (parts[0] ?? '').toLowerCase();
+    if (head === 'off' || head === 'none')
+        return parts.length === 1 ? { kind: 'off' } : undefined;
+    if (head === 'mail') {
+        const address = parts[1];
+        if (parts.length !== 2 || address === undefined || !address.includes('@'))
+            return undefined;
+        return { kind: 'mail', address };
+    }
+    if (head === 'smtp')
+        return parseSmtpTarget(parts.slice(1));
+    if (head === 'local')
+        return parseLocalTarget(parts.slice(1));
+    return undefined;
+}
+/** `host[:port] from to [user [password]]`, port defaulting to submission. */
+function parseSmtpTarget(parts) {
+    const server = splitHostPort(parts[0] ?? '', SMTP_PORT_DEFAULT);
+    const from = parts[1];
+    const to = parts[2];
+    if (server === undefined || from === undefined || to === undefined)
+        return undefined;
+    if (!from.includes('@') || !to.includes('@'))
+        return undefined;
+    if (parts.length > 5)
+        return undefined;
+    const user = parts[3];
+    const password = parts[4];
+    return {
+        kind: 'smtp',
+        host: server.host,
+        port: server.port,
+        from,
+        to,
+        ...(user === undefined ? {} : { user }),
+        ...(password === undefined ? {} : { password }),
+    };
+}
+/** `[port] from to`, the port defaulting to 25. */
+function parseLocalTarget(parts) {
+    const leadingPort = parts.length === 3 && /^\d{1,5}$/u.test(parts[0] ?? '');
+    const port = leadingPort ? Number(parts[0]) : LOCAL_PORT_DEFAULT;
+    const from = parts[leadingPort ? 1 : 0];
+    const to = parts[leadingPort ? 2 : 1];
+    if (parts.length !== (leadingPort ? 3 : 2))
+        return undefined;
+    if (from === undefined || to === undefined || !from.includes('@') || !to.includes('@'))
+        return undefined;
+    if (!Number.isInteger(port) || port < 1 || port > 65535)
+        return undefined;
+    return { kind: 'local', port, from, to };
+}
+/** `host`, `host:587`, or `[::1]:25`. */
+function splitHostPort(text, fallback) {
+    const trimmed = text.trim();
+    if (trimmed === '')
+        return undefined;
+    const bracketed = /^\[([^\]]+)\](?::(\d{1,5}))?$/u.exec(trimmed);
+    if (bracketed !== null) {
+        const port = bracketed[2] === undefined ? fallback : Number(bracketed[2]);
+        if (!Number.isInteger(port) || port < 1 || port > 65535)
+            return undefined;
+        return { host: bracketed[1] ?? '', port };
+    }
+    const colon = trimmed.lastIndexOf(':');
+    if (colon > 0 && /^\d{1,5}$/u.test(trimmed.slice(colon + 1))) {
+        const port = Number(trimmed.slice(colon + 1));
+        if (port < 1 || port > 65535)
+            return undefined;
+        return { host: trimmed.slice(0, colon), port };
+    }
+    return { host: trimmed, port: fallback };
+}
+/**
+ * The shell command one target runs.
+ *
+ * SMTP and the local mailer both go through Python's stdlib `smtplib`, which
+ * is present on every jump host this plugin runs on (Node itself is). The
+ * password, when there is one, is read from `DSH_TUI_NOTIFY_SMTP_PASSWORD` at
+ * send time rather than written into the command, so it never lands in the
+ * settings file or the process list. The message text arrives on stdin.
+ * @param target - a parsed target other than `off`.
+ * @returns the command `/notify` stores.
+ */
+/**
+ * What `/notify` confirms back: the target in the user's own words, without the
+ * password.
+ * @param target - a parsed target other than `off`.
+ * @returns a short label.
+ */
+export function notifyTargetLabel(target) {
+    if (target.kind === 'mail')
+        return `mail ${target.address}`;
+    if (target.kind === 'local')
+        return `127.0.0.1:${target.port} → ${target.to}`;
+    const auth = target.user === undefined ? '' : ` (${target.user})`;
+    return `${target.host}:${target.port}${auth} → ${target.to}`;
+}
+export function notifyTargetCommand(target) {
+    if (target.kind === 'mail')
+        return mailNotifyCommand(target.address);
+    const host = target.kind === 'local' ? '127.0.0.1' : target.host;
+    return `python3 -c ${shellWord(smtpBridge(target.kind === 'smtp'))} ${shellWord(host)} ${String(target.port)} ${shellWord(target.from)} ${shellWord(target.to)}`;
+}
+/**
+ * The Python that reads the notice on stdin and hands it to `smtplib`.
+ *
+ * One script for both targets: the local mailer is the same call with no login.
+ * Authentication happens only when the environment holds a password, so a
+ * server that accepts unauthenticated submission needs nothing else.
+ * @param authenticated - whether this target may log in.
+ * @returns the script, with no host-specific data in it.
+ */
+function smtpBridge(authenticated) {
+    const login = authenticated
+        ? [
+            '    user=os.environ.get("DSH_TUI_NOTIFY_SMTP_USER","")',
+            '    password=os.environ.get("DSH_TUI_NOTIFY_SMTP_PASSWORD","")',
+            '    if user and password:',
+            '        try:',
+            '            s.login(user,password)',
+            '        except smtplib.SMTPNotSupportedError:',
+            '            pass',
+        ].join('\n')
+        : '';
+    return [
+        'import os,smtplib,sys',
+        'host,port,sender,recipient=sys.argv[1],int(sys.argv[2]),sys.argv[3],sys.argv[4]',
+        'body=sys.stdin.read()',
+        'subject=os.environ.get("DSH_TUI_NOTIFY_SUBJECT","dsh")',
+        'msg="Subject: "+subject+"\\r\\nContent-Type: text/plain; charset=utf-8\\r\\n\\r\\n"+body',
+        's=smtplib.SMTP(host,port,timeout=10)',
+        'try:',
+        login.trimEnd(),
+        '    s.sendmail(sender,[recipient],msg.encode("utf-8"))',
+        'finally:',
+        '    s.quit()',
+    ].filter(line => line !== '').join('\n');
+}
+/**
+ * A mail command for an address, using whichever sender the host has.
+ *
+ * `mail` (or `mailx`) is on most jump hosts and speaks SMTP for them; no
+ * provider, token, or library joins this plugin. The body arrives on stdin, so
+ * the question text is never a shell argument.
+ * @param address - where the mail goes.
+ * @returns the command.
+ */
+export function mailNotifyCommand(address) {
+    return `mail -s ${shellWord(t('notify.mailSubject'))} -- ${shellWord(address)}`;
+}
+/**
+ * A WeCom group-robot command for one webhook key.
+ *
+ * The payload is assembled by the caller and sent with `curl`, which a jump
+ * host already has. The key is the only secret, and it stays in the command the
+ * user configured rather than in this repo.
+ * @param key - the robot's webhook key.
+ * @returns the command.
+ */
+export function wecomNotifyCommand(key) {
+    const endpoint = `https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${encodeURIComponent(key)}`;
+    return `curl -fsS -m 10 -X POST -H "Content-Type: application/json" --data-binary @- ${shellWord(endpoint)}`;
+}
+/** One single-quoted shell word, so an address or URL survives the command line. */
+function shellWord(value) {
+    return `'${value.replaceAll("'", "'\\''")}'`;
+}
+/**
+ * The text a notification shows. Short on purpose: a mail subject and a WeCom
+ * message both get truncated by their carrier, so the resume command has to fit.
+ * @param context - the question being announced.
+ * @returns the message, one fact per line.
+ */
+export function notifyMessage(context) {
+    return [
+        t('notify.body', {
+            session: context.sessionId,
+            count: context.count,
+            waited: formatWaited(context.waitedMs),
+        }),
+        context.question,
+        t('notify.resume', { command: context.resumeCommand }),
+    ].join('\n');
+}
+/** `45s`, `3m`, `2h` — coarse, since the carrier will not show seconds anyway. */
+function formatWaited(ms) {
+    const seconds = Math.max(0, Math.round(ms / 1000));
+    if (seconds < 60)
+        return `${seconds}s`;
+    const minutes = Math.round(seconds / 60);
+    if (minutes < 60)
+        return `${minutes}m`;
+    return `${Math.round(minutes / 60)}h`;
+}
+/**
+ * The body a WeCom robot expects: a text message whose content is the notice.
+ * @param context - the question being announced.
+ * @returns JSON.
+ */
+export function wecomPayload(context) {
+    return JSON.stringify({ msgtype: 'text', text: { content: notifyMessage(context) } });
+}
+/**
+ * Run the user's notify command once.
+ *
+ * The message goes to stdin and the facts go to the environment, so a command
+ * can be either `mail` (reads stdin) or anything that reads the variables. The
+ * command runs through a shell because it is a shell command by nature — the
+ * user wrote it as one — and the platform's own shell, so a Windows host uses
+ * `cmd`. Nothing it prints or fails with comes back: a notification that errors
+ * must not surface in the transcript or delay the question.
+ * @param command - the configured command.
+ * @param context - the question being announced.
+ * @param deps - injectable process spawn and clock, for tests.
+ * @returns once the command has exited, timed out, or failed to start.
+ */
+export async function runNotify(command, context, deps = {}) {
+    const spawnFn = deps.spawnFn ?? spawn;
+    const message = notifyMessage(context);
+    const shell = notifyShell(deps.platform);
+    const env = {
+        ...process.env,
+        DSH_TUI_NOTIFY_SESSION: context.sessionId,
+        DSH_TUI_NOTIFY_COUNT: String(context.count),
+        DSH_TUI_NOTIFY_QUESTION: context.question,
+        DSH_TUI_NOTIFY_WAITED_MS: String(Math.max(0, context.waitedMs)),
+        DSH_TUI_NOTIFY_RESUME: context.resumeCommand,
+        DSH_TUI_NOTIFY_SUBJECT: t('notify.mailSubject'),
+        ...(context.smtpUser === undefined ? {} : { DSH_TUI_NOTIFY_SMTP_USER: context.smtpUser }),
+        ...(context.smtpPassword === undefined ? {} : { DSH_TUI_NOTIFY_SMTP_PASSWORD: context.smtpPassword }),
+    };
+    await new Promise(resolve => {
+        let child;
+        try {
+            child = spawnFn(shell.command, [shell.flag, command], {
+                env,
+                stdio: ['pipe', 'ignore', 'ignore'],
+                windowsHide: true,
+                detached: false,
+            });
+        }
+        catch {
+            resolve();
+            return;
+        }
+        let settled = false;
+        const finish = () => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timer);
+            resolve();
+        };
+        const timer = setTimeout(() => {
+            try {
+                child.kill();
+            }
+            catch { /* already gone */ }
+            finish();
+        }, deps.timeoutMs ?? NOTIFY_TIMEOUT_MS);
+        timer.unref?.();
+        child.on('error', finish);
+        child.on('exit', finish);
+        child.stdin?.on('error', finish);
+        try {
+            child.stdin?.end(message);
+        }
+        catch {
+            finish();
+        }
+    });
+}
+/**
+ * The shell that runs a notify command, and the flag that precedes it.
+ *
+ * A jump host means `sh -c`. Windows has no `sh` on PATH as a rule, so there
+ * the command runs under `cmd /c` and the user writes it for `cmd`.
+ * @param platform - injectable so the Windows shape is testable from POSIX.
+ * @returns the executable and its command flag.
+ */
+export function notifyShell(platform = process.platform) {
+    return platform === 'win32' ? { command: 'cmd', flag: '/c' } : { command: 'sh', flag: '-c' };
+}
+//# sourceMappingURL=question-wait.js.map

package/lib/question-wait.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"question-wait.js","sourceRoot":"","sources":["../src/question-wait.ts"],"names":[],"mappings":"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"}

package/lib/route-memory.js

@@ -3,7 +3,7 @@
  * routes without wiping the previous provider's choice.
  */
 import z from '@deepseek-ai/schemastery';
-import { installSettingsSection, settingsNamespace } from './dsh-compat.js';
+import { installSettingsSection, liveField, settingsNamespace } from './dsh-compat.js';
 export const ROUTE_MEMORY_NAMESPACE = settingsNamespace('ssh-tui-routes');
 /**
  * Settings schema for `$DSH_HOME/settings.yaml` under ssh-tui-routes.
@@ -14,11 +14,11 @@ export const ROUTE_MEMORY_NAMESPACE = settingsNamespace('ssh-tui-routes');
  * with TS2742 on any layout that does not match this machine's.
  */
 export const ROUTE_MEMORY_SCHEMA = z.object({
-    providers: z.dict(z.object({
+    providers: liveField(z.dict(z.object({
         model: z.string(),
         reasoningEffort: z.string().default(''),
         updatedAt: z.number(),
-    })).default({}),
+    })).default({})),
 });
 export function parseRouteMemory(raw) {
     if (raw === null || typeof raw !== 'object' || Array.isArray(raw))

package/lib/route-memory.js.map

@@ -1 +1 @@
-{"version":3,"file":"route-memory.js","sourceRoot":"","sources":["../src/route-memory.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,CAAC,MAAM,0BAA0B,CAAA;AAExC,OAAO,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAE3E,MAAM,CAAC,MAAM,sBAAsB,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,CAAA;AAOzE;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAA2B,CAAC,CAAC,MAAM,CAAC;IAClE,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;QACzB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;QACjB,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;QACvC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;KACtB,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;CAChB,CAAC,CAAA;AAWF,MAAM,UAAU,gBAAgB,CAAC,GAAY;IAC3C,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,CAAA;IAC5E,MAAM,GAAG,GAAmB,EAAE,CAAA;IAC9B,KAAK,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAA8B,CAAC,EAAE,CAAC;QAC/E,MAAM,EAAE,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAA;QAC1B,IAAI,EAAE,KAAK,EAAE,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;YAAE,SAAQ;QAC9F,MAAM,GAAG,GAAG,KAAgC,CAAA;QAC5C,MAAM,KAAK,GAAG,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QACnE,IAAI,KAAK,KAAK,EAAE;YAAE,SAAQ;QAC1B,MAAM,MAAM,GAAG,OAAO,GAAG,CAAC,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QACxF,MAAM,SAAS,GAAG,OAAO,GAAG,CAAC,SAAS,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;QACzG,GAAG,CAAC,EAAE,CAAC,GAAG;YACR,KAAK;YACL,GAAG,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC;YACrD,GAAG,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACxC,CAAA;IACH,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,MAAsB,EAAE,QAAgB;IACzE,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;AAChC,CAAC;AAED,2EAA2E;AAC3E,MAAM,UAAU,qBAAqB,CACnC,MAAsB;IAEtB,IAAI,IAA0D,CAAA;IAC9D,KAAK,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACvD,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC;YACzE,IAAI,GAAG,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,CAAA;QAC/B,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED,sFAAsF;AACtF,MAAM,UAAU,kBAAkB,CAAC,GAAY;IAC7C,sBAAsB,CAAC,GAAG,EAAE,sBAAsB,EAAE,mBAAmB,EAAE;QACvE,SAAS,EAAE,EAAE;KACd,EAAE;QACD,SAAS,EAAE,GAAG,EAAE,GAAE,CAAC;QACnB,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;KACnB,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,MAAsB,EACtB,QAAgB,EAChB,KAAsB;IAEtB,MAAM,EAAE,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAA;IAC1B,IAAI,EAAE,KAAK,EAAE,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE;QAAE,OAAO,MAAM,CAAA;IACzD,OAAO;QACL,GAAG,MAAM;QACT,CAAC,EAAE,CAAC,EAAE;YACJ,GAAG,CAAC,KAAK,CAAC,eAAe,KAAK,SAAS,IAAI,KAAK,CAAC,eAAe,KAAK,EAAE;gBACrE,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE;gBACxB,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,eAAe,EAAE,KAAK,CAAC,eAAe,EAAE,CAAC;YACnE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB;KACF,CAAA;AACH,CAAC"}
+{"version":3,"file":"route-memory.js","sourceRoot":"","sources":["../src/route-memory.ts"],"names":[],"mappings":"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"}

package/lib/selection.js

@@ -9,16 +9,26 @@
  * OSC 52 (the channel `/copy` already uses).
  *
  * Only **model replies** are freely selectable. Everything here is pure: the
- * caller passes the painted lines (plain text plus whether each one came from a
- * reply) and gets back the ordered selection, the cell spans to paint in
- * reverse video, and the text to copy. The IO — mouse reports, OSC 52, notices —
- * stays in `tui.ts`.
+ * caller passes the painted lines (plain text, whether each one came from a
+ * reply, and how many leading cells are chrome) and gets back the ordered
+ * selection, the cell spans to paint in reverse video, and the text to copy.
+ * The IO — mouse reports, OSC 52, notices — stays in `tui.ts`.
  *
  * Columns are **cells**, not characters: a CJK glyph is two cells wide, and a
  * selection that touches either half includes the whole glyph. Surrogate pairs
  * (emoji) are treated the same way.
  */
 import { displayWidth } from './term-text.js';
+/**
+ * Characters at the start of a line that cover its gutter.
+ *
+ * Cells and characters differ (`▶` is one character and two cells wide), so the
+ * cut is found by measuring the way the painter measures, and a selection's
+ * offsets are then computed inside the content that follows it.
+ */
+function gutterCut(text, gutter) {
+    return gutter <= 0 ? 0 : offsetAtColumn(text, gutter);
+}
 /** Order two dragged points, whichever way the drag went. */
 export function orderPoints(anchor, extent) {
     const before = anchor.line < extent.line
@@ -125,7 +135,12 @@ export function selectionSpans(lines, selection) {
     for (let line = selection.from.line; line <= selection.to.line; line += 1) {
         const text = lines[line]?.text ?? '';
         const width = lineWidth(text);
-        const start = line === selection.from.line ? Math.min(selection.from.column, width) : 0;
+        const gutter = Math.min(width, Math.max(0, lines[line]?.gutter ?? 0));
+        // The marker is never part of the selection: it says which row is focused,
+        // it is not content, and inverting it made the marker look selected too.
+        const start = line === selection.from.line
+            ? Math.max(gutter, Math.min(selection.from.column, width))
+            : gutter;
         const end = line === selection.to.line ? Math.min(selection.to.column, width) : width;
         if (end > start)
             spans.push({ line, start, end });
@@ -140,14 +155,17 @@ export function selectionText(lines, selection) {
     const parts = [];
     for (let line = selection.from.line; line <= selection.to.line; line += 1) {
         const text = lines[line]?.text ?? '';
-        const startOffset = line === selection.from.line ? offsetAtColumn(text, selection.from.column) : 0;
-        const endOffset = line === selection.to.line ? offsetAfterColumn(text, selection.to.column) : text.length;
+        const gutter = Math.max(0, lines[line]?.gutter ?? 0);
+        const cut = gutterCut(text, gutter);
+        const body = text.slice(cut);
+        const startOffset = line === selection.from.line ? offsetAtColumn(body, selection.from.column - gutter) : 0;
+        const endOffset = line === selection.to.line ? offsetAfterColumn(body, selection.to.column - gutter) : body.length;
         if (endOffset <= startOffset) {
             // A drag that stops at a line's first cell still selects that line's break.
             parts.push('');
             continue;
         }
-        parts.push(text.slice(startOffset, endOffset).replace(/\s+$/u, ''));
+        parts.push(body.slice(startOffset, endOffset).replace(/\s+$/u, ''));
     }
     return parts.join('\n').replace(/\n+$/u, '');
 }

package/lib/selection.js.map

@@ -1 +1 @@
-{"version":3,"file":"selection.js","sourceRoot":"","sources":["../src/selection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"selection.js","sourceRoot":"","sources":["../src/selection.ts"],"names":[],"mappings":"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"}

package/lib/session-index.js

@@ -3,6 +3,7 @@
  * session.jsonl.zstd on each launch. Invalidated by file mtime/size.
  */
 import { resolveDshHome } from './display-sock.js';
+import { restrictPathToUser } from './platform.js';
 import { mkdir, readFile, rename, writeFile } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
 import { statSync } from 'node:fs';
@@ -65,10 +66,14 @@ export async function saveSessionIndex(path, entries) {
         await mkdir(dirname(path), { recursive: true });
         await writeFile(tmp, body, { encoding: 'utf8', mode: 0o600 });
         await rename(tmp, path);
+        // `mode` is a POSIX-only promise: on Windows the intent is an ACL, and the
+        // index names every session on the machine.
+        await restrictPathToUser(path, { mode: 0o600 });
     }
     catch {
         try {
             await writeFile(path, body, { encoding: 'utf8', mode: 0o600 });
+            await restrictPathToUser(path, { mode: 0o600 });
         }
         catch { /* best-effort */ }
     }

package/lib/session-index.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-index.js","sourceRoot":"","sources":["../src/session-index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAErE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAoBnD,6EAA6E;AAC7E,+EAA+E;AAC/E,4BAA4B;AAC5B,MAAM,aAAa,GAAG,CAAC,CAAA;AAEvB,8EAA8E;AAC9E,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAA;AAEtC,MAAM,UAAU,gBAAgB,CAAC,OAAO,GAAG,cAAc,EAAE;IACzD,OAAO,IAAI,CAAC,OAAO,EAAE,wBAAwB,CAAC,CAAA;AAChD,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,mBAAmB,CACjC,WAAmB,EACnB,IAAY;IAEZ,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;QACrD,IAAI,QAAQ,EAAE,IAAI,KAAK,SAAS,IAAI,QAAQ,CAAC,IAAI,KAAK,EAAE;YAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAA;QACxF,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QACpC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAA;IAC/D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAA;IAChC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,KAAoC,EACpC,IAAuC;IAEvC,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,KAAK,CAAA;IACrC,OAAO,KAAK,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE,KAAK,EAAE,CAAA;AACtF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,IAAY;IAEZ,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAqB,CAAA;QAC3E,IAAI,MAAM,CAAC,OAAO,KAAK,aAAa,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YACtG,OAAO,IAAI,GAAG,EAAE,CAAA;QAClB,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,GAAG,EAA6B,CAAA;QAChD,KAAK,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YACzD,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ;gBAAE,SAAQ;YACzD,IAAI,OAAO,KAAK,CAAC,EAAE,KAAK,QAAQ,IAAI,KAAK,CAAC,EAAE,KAAK,EAAE;gBAAE,SAAQ;YAC7D,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;QACpB,CAAC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,GAAG,EAAE,CAAA;IAClB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,IAAY,EACZ,OAA+C;IAE/C,MAAM,OAAO,GAAqB;QAChC,OAAO,EAAE,aAAa;QACtB,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC;KACrC,CAAA;IACD,MAAM,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAA;IAC3C,MAAM,GAAG,GAAG,GAAG,IAAI,IAAI,OAAO,CAAC,GAAG,MAAM,CAAA;IACxC,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAC/C,MAAM,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;QAC7D,MAAM,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IACzB,CAAC;IAAC,MAAM,CAAC;QACP,IAAI,CAAC;YAAC,MAAM,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC;IACpG,CAAC;AACH,CAAC;AAED,gFAAgF;AAChF,MAAM,UAAU,iBAAiB,CAC/B,OAAuC,EACvC,OAA4B;IAE5B,KAAK,MAAM,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;QACrC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAAE,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAC1C,CAAC;AACH,CAAC"}
+{"version":3,"file":"session-index.js","sourceRoot":"","sources":["../src/session-index.ts"],"names":[],"mappings":"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"}

package/lib/session-lock.js

@@ -9,6 +9,7 @@ import { readFileSync } from 'node:fs';
 import { execFile } from 'node:child_process';
 import { dirname, join } from 'node:path';
 import { t } from './i18n/index.js';
+import { restrictPathToUser, usesProcessIdentity } from './platform.js';
 import { displaySockExists, isPipePath, resolveDshHome, sessionLabel, sessionSockLookupPaths, sessionSockPath } from './display-sock.js';
 export class SessionLockHeldError extends Error {
     lock;
@@ -290,7 +291,7 @@ export async function lockOwnerIsAlive(lock) {
         return false;
     if (!processIsAlive(pid))
         return false;
-    if (process.platform === 'win32') {
+    if (usesProcessIdentity()) {
         return windowsProcessMatchesLock(lock, await windowsProcessIdentity(lock));
     }
     if (lock.bootId !== undefined && lock.pidStart !== undefined) {
@@ -324,7 +325,9 @@ export async function readSessionLock(sessionId, dshHome = resolveDshHome()) {
 }
 export async function writeSessionLock(path, info) {
     await mkdir(dirname(path), { recursive: true, mode: 0o700 });
+    await restrictPathToUser(dirname(path), { mode: 0o700, directory: true });
     await writeFile(path, `${JSON.stringify(info, null, 2)}\n`, { mode: 0o600 });
+    await restrictPathToUser(path, { mode: 0o600 });
 }
 export async function acquireSessionLock(sessionId, options = {}) {
     const dshHome = options.dshHome ?? resolveDshHome();