@achieveai/hitl-mcp-server 2.11.0 → 2.12.0

package/dist/config.d.ts

@@ -1,6 +1,6 @@
 import type { HitlConfig } from './types.js';
 /**
- * Read the HITL config from ~/.hitl/config.json.
+ * Read the HITL config from this install's config.json (see hitlDir).
  * Throws with a helpful message if the file doesn't exist.
  */
 export declare function loadConfig(): HitlConfig;
@@ -9,7 +9,7 @@ export declare function loadConfig(): HitlConfig;
  */
 export declare function generateDefaultConfig(): HitlConfig;
 /**
- * Save a config object to ~/.hitl/config.json.
+ * Save a config object to this install's config.json (see hitlDir).
  */
 export declare function saveConfig(config: HitlConfig): void;
 /**

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAM7C;;;GAGG;AACH,wBAAgB,UAAU,IAAI,UAAU,CAuBvC;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,UAAU,CAQlD;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CAGnD;AAED;;GAEG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAEtC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAmC7C;;;GAGG;AACH,wBAAgB,UAAU,IAAI,UAAU,CAyBvC;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,UAAU,CASlD;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CAcnD;AAED;;GAEG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAEtC"}

package/dist/config.js

@@ -1,25 +1,54 @@
-import { readFileSync, writeFileSync, mkdirSync, existsSync } from 'fs';
+import { readFileSync, writeFileSync, mkdirSync, existsSync, copyFileSync } from 'fs';
 import { homedir, hostname } from 'os';
 import path from 'path';
 import crypto from 'crypto';
 import { v4 as uuidv4 } from 'uuid';
 import { DEFAULT_NTFY_URL } from './types.js';
-const CONFIG_DIR = path.join(homedir(), '.hitl');
-const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json');
 /**
- * Read the HITL config from ~/.hitl/config.json.
+ * Root of this install's state, mirroring `hitl_transport::paths::hitl_dir()`.
+ *
+ * `HITL_HOME` has to be honoured here, not just in Rust. The Rust side resolves
+ * `config.json` through `hitl_dir()`, while this — the only thing that ever
+ * *writes* that file, via `hitl init` — used to hardcode `~/.hitl`. Under
+ * `HITL_HOME` the two languages then read and wrote different files, and the
+ * Rust binaries answered with "Run 'hitl init' to create one", advice that
+ * rewrites the same wrong path forever. `ntfy-transport.ts` and
+ * `snapshot-store.ts` already resolve their subdirectories this way; config was
+ * the odd one out.
+ *
+ * Read per call rather than at import so tests and a relaunched process both
+ * see the current environment. Empty is rejected rather than treated as unset,
+ * matching the Rust rule — an empty value there would silently mean the process
+ * working directory.
+ */
+function hitlDir() {
+    const override = process.env.HITL_HOME;
+    if (override !== undefined) {
+        if (override.trim() === '') {
+            throw new Error('HITL_HOME is set but empty; unset it or give it a real path');
+        }
+        return override;
+    }
+    return path.join(homedir(), '.hitl');
+}
+function configFile() {
+    return path.join(hitlDir(), 'config.json');
+}
+/**
+ * Read the HITL config from this install's config.json (see hitlDir).
  * Throws with a helpful message if the file doesn't exist.
  */
 export function loadConfig() {
-    if (!existsSync(CONFIG_FILE)) {
-        throw new Error(`HITL config not found at ${CONFIG_FILE}\n` +
+    const file = configFile();
+    if (!existsSync(file)) {
+        throw new Error(`HITL config not found at ${file}\n` +
             `Run "hitl init" to create one, or manually create the file with:\n` +
             JSON.stringify(generateDefaultConfig(), null, 2));
     }
-    const raw = readFileSync(CONFIG_FILE, 'utf-8');
+    const raw = readFileSync(file, 'utf-8');
     const parsed = JSON.parse(raw);
     if (!parsed.topicId || typeof parsed.topicId !== 'string') {
-        throw new Error(`Invalid config: "topicId" is required in ${CONFIG_FILE}`);
+        throw new Error(`Invalid config: "topicId" is required in ${file}`);
     }
     return {
         topicId: parsed.topicId,
@@ -27,6 +56,7 @@ export function loadConfig() {
         deviceName: parsed.deviceName || hostname(),
         soundEnabled: parsed.soundEnabled !== false,
         encryptionKey: parsed.encryptionKey || undefined,
+        identityEnabled: parsed.identityEnabled !== false,
     };
 }
 /**
@@ -39,19 +69,32 @@ export function generateDefaultConfig() {
         deviceName: hostname(),
         soundEnabled: true,
         encryptionKey: crypto.randomBytes(32).toString('hex'),
+        identityEnabled: true,
     };
 }
 /**
- * Save a config object to ~/.hitl/config.json.
+ * Save a config object to this install's config.json (see hitlDir).
  */
 export function saveConfig(config) {
-    mkdirSync(CONFIG_DIR, { recursive: true });
-    writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2) + '\n', 'utf-8');
+    mkdirSync(hitlDir(), { recursive: true });
+    // Keep the outgoing config. A regenerated default silently swaps in a
+    // public ntfyUrl, a fresh topic and a fresh encryption key; without this
+    // copy a self-hosted setup is unrecoverable once the original is gone.
+    const target = configFile();
+    if (existsSync(target)) {
+        try {
+            copyFileSync(target, `${target}.bak`);
+        }
+        catch {
+            // A backup that cannot be written must not block saving the config.
+        }
+    }
+    writeFileSync(target, JSON.stringify(config, null, 2) + '\n', 'utf-8');
 }
 /**
  * Get the path to the config file.
  */
 export function getConfigPath() {
-    return CONFIG_FILE;
+    return configFile();
 }
 //# sourceMappingURL=config.js.map

package/dist/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AACvC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;AACjD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;AAEzD;;;GAGG;AACH,MAAM,UAAU,UAAU;IACxB,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CACb,4BAA4B,WAAW,IAAI;YAC3C,oEAAoE;YACpE,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CACjD,CAAC;IACJ,CAAC;IAED,MAAM,GAAG,GAAG,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAwB,CAAC;IAEtD,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CAAC,4CAA4C,WAAW,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,OAAO;QACL,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,gBAAgB;QAC3C,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,QAAQ,EAAE;QAC3C,YAAY,EAAE,MAAM,CAAC,YAAY,KAAK,KAAK;QAC3C,aAAa,EAAE,MAAM,CAAC,aAAa,IAAI,SAAS;KACjD,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,qBAAqB;IACnC,OAAO;QACL,OAAO,EAAE,QAAQ,MAAM,EAAE,EAAE;QAC3B,OAAO,EAAE,gBAAgB;QACzB,UAAU,EAAE,QAAQ,EAAE;QACtB,YAAY,EAAE,IAAI;QAClB,aAAa,EAAE,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;KACtD,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,MAAkB;IAC3C,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3C,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;AAC9E,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa;IAC3B,OAAO,WAAW,CAAC;AACrB,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}

package/dist/git-context.d.ts

@@ -8,6 +8,18 @@ import type { RepoContext } from './types.js';
  * Returns null gracefully if git is unavailable or the directory is not a repo.
  */
 export declare function detectRepoContext(cwd?: string): RepoContext | null;
+/**
+ * Whether `cwd` is inside a *linked* git worktree (created via `git worktree add`),
+ * as opposed to the main working tree or a plain non-worktree repo.
+ *
+ * `--git-dir` and `--git-common-dir` point at the same place in the main working
+ * tree; a linked worktree has its own `--git-dir` under `.git/worktrees/<name>`
+ * while `--git-common-dir` still points at the shared repo. Resolved to absolute
+ * paths before comparing since git may print either relative or absolute output
+ * depending on platform/version. Returns `false` (never throws) when `cwd` isn't
+ * a git repo at all.
+ */
+export declare function isLinkedWorktree(cwd?: string): boolean;
 /**
  * Absolute path of the repository root containing `dir`, or null when `dir`
  * is not inside a work tree.

package/dist/git-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git-context.d.ts","sourceRoot":"","sources":["../src/git-context.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAwBlE;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAY1D;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAYpE;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAYhF;AAED,kFAAkF;AAClF,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAExE;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAG/C"}
+{"version":3,"file":"git-context.d.ts","sourceRoot":"","sources":["../src/git-context.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAW9C;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAclE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,GAAE,MAAsB,GAAG,OAAO,CAKrE;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAY1D;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAYpE;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAYhF;AAED,kFAAkF;AAClF,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAExE;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAG/C"}

package/dist/git-context.js

@@ -1,5 +1,14 @@
 import { execSync } from 'child_process';
 import path from 'path';
+/** Run a git command in `cwd`, tolerating any failure. Trims stdout; empty output ⇒ undefined. */
+function run(cmd, cwd) {
+    try {
+        return execSync(cmd, { cwd, encoding: 'utf-8', timeout: 5000, stdio: 'pipe' }).trim() || undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 /**
  * Auto-detect git repository context.
  *
@@ -9,28 +18,35 @@ import path from 'path';
  * Returns null gracefully if git is unavailable or the directory is not a repo.
  */
 export function detectRepoContext(cwd) {
-    const opts = { cwd: cwd ?? process.cwd(), encoding: 'utf-8', timeout: 5000 };
-    try {
-        // Quick check: are we in a git repo at all?
-        execSync('git rev-parse --is-inside-work-tree', { ...opts, stdio: 'pipe' });
-    }
-    catch {
+    const resolvedCwd = cwd ?? process.cwd();
+    // Quick check: are we in a git repo at all?
+    if (run('git rev-parse --is-inside-work-tree', resolvedCwd) === undefined) {
         return null;
     }
-    const run = (cmd) => {
-        try {
-            return execSync(cmd, { ...opts, stdio: 'pipe' }).trim() || undefined;
-        }
-        catch {
-            return undefined;
-        }
-    };
-    const toplevel = run('git rev-parse --show-toplevel');
+    const toplevel = run('git rev-parse --show-toplevel', resolvedCwd);
     const name = toplevel ? toplevel.split('/').pop() ?? toplevel.split('\\').pop() ?? 'unknown' : 'unknown';
-    const branch = run('git branch --show-current') ?? 'HEAD';
-    const remoteUrl = run('git remote get-url origin');
+    const branch = run('git branch --show-current', resolvedCwd) ?? 'HEAD';
+    const remoteUrl = run('git remote get-url origin', resolvedCwd);
     return { name, branch, remoteUrl };
 }
+/**
+ * Whether `cwd` is inside a *linked* git worktree (created via `git worktree add`),
+ * as opposed to the main working tree or a plain non-worktree repo.
+ *
+ * `--git-dir` and `--git-common-dir` point at the same place in the main working
+ * tree; a linked worktree has its own `--git-dir` under `.git/worktrees/<name>`
+ * while `--git-common-dir` still points at the shared repo. Resolved to absolute
+ * paths before comparing since git may print either relative or absolute output
+ * depending on platform/version. Returns `false` (never throws) when `cwd` isn't
+ * a git repo at all.
+ */
+export function isLinkedWorktree(cwd = process.cwd()) {
+    const gitDir = run(`git rev-parse --git-dir`, cwd);
+    const gitCommonDir = run(`git rev-parse --git-common-dir`, cwd);
+    if (gitDir === undefined || gitCommonDir === undefined)
+        return false;
+    return path.resolve(cwd, gitDir) !== path.resolve(cwd, gitCommonDir);
+}
 /**
  * Absolute path of the repository root containing `dir`, or null when `dir`
  * is not inside a work tree.

package/dist/git-context.js.map

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

package/dist/identity.d.ts

@@ -0,0 +1,36 @@
+import type { RepoContext, SenderIdentity } from './types.js';
+/** Resolves a human-readable session name, or null when none is available. */
+export type SessionNameResolver = () => string | null;
+/**
+ * Builds a `SessionNameResolver` that prefers the Claude Code Remote Control
+ * bridge session id (`CLAUDE_CODE_BRIDGE_SESSION_ID`, set only while Remote
+ * Control is active, v2.1.199+) and falls back to a minted id otherwise
+ * (spec §5.2, §5.3).
+ *
+ * The bridge id can appear or disappear mid-process, so the result is
+ * resolved once, at first call, and cached — a label that changes mid-session
+ * would be worse than one that is merely opportunistic.
+ */
+export declare function makeSessionNameResolver(opts: {
+    env: NodeJS.ProcessEnv;
+    mintedUuid: string;
+}): SessionNameResolver;
+export declare const defaultSessionNameResolver: SessionNameResolver;
+/**
+ * Stable key for "which project" a session belongs to (spec §5.4).
+ * `CLAUDE_PROJECT_DIR` is documented and survives `--resume`/context
+ * compaction, unlike `process.cwd()`; `repo.remoteUrl` survives the repo
+ * being moved or re-cloned to a different path; `cwd` is the last resort.
+ */
+export declare function resolveProjectKey(cwd: string, repo: RepoContext | null): string;
+/**
+ * Resolve a display-ready sender identity for an outgoing message, in
+ * precedence order: session name override > linked-worktree branch > path
+ * fallback.
+ *
+ * Purely a function of its arguments — never reads `process.cwd()` or
+ * `os.hostname()` itself, so callers control (and tests can mock) both `cwd`
+ * and `deviceName`; per-tool cwd rules live at each call site.
+ */
+export declare function resolveSenderIdentity(cwd: string, deviceName: string, sessionResolver?: SessionNameResolver): SenderIdentity;
+//# sourceMappingURL=identity.d.ts.map

package/dist/identity.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"identity.d.ts","sourceRoot":"","sources":["../src/identity.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE9D,8EAA8E;AAC9E,MAAM,MAAM,mBAAmB,GAAG,MAAM,MAAM,GAAG,IAAI,CAAC;AAKtD;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE;IAC5C,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,mBAAmB,CAQtB;AAED,eAAO,MAAM,0BAA0B,EAAE,mBAGvC,CAAC;AAEH;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,IAAI,GAAG,MAAM,CAE/E;AAyCD;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAClB,eAAe,GAAE,mBAAgD,GAChE,cAAc,CAYhB"}

package/dist/identity.js

@@ -0,0 +1,96 @@
+import { randomUUID } from 'crypto';
+import { detectRepoContext, isLinkedWorktree } from './git-context.js';
+/** One MCP server process is exactly one Claude Code session. */
+const PROCESS_SESSION_UUID = randomUUID();
+/**
+ * Builds a `SessionNameResolver` that prefers the Claude Code Remote Control
+ * bridge session id (`CLAUDE_CODE_BRIDGE_SESSION_ID`, set only while Remote
+ * Control is active, v2.1.199+) and falls back to a minted id otherwise
+ * (spec §5.2, §5.3).
+ *
+ * The bridge id can appear or disappear mid-process, so the result is
+ * resolved once, at first call, and cached — a label that changes mid-session
+ * would be worse than one that is merely opportunistic.
+ */
+export function makeSessionNameResolver(opts) {
+    let resolved = null;
+    return () => {
+        if (resolved === null) {
+            resolved = opts.env.CLAUDE_CODE_BRIDGE_SESSION_ID ?? opts.mintedUuid;
+        }
+        return resolved;
+    };
+}
+export const defaultSessionNameResolver = makeSessionNameResolver({
+    env: process.env,
+    mintedUuid: PROCESS_SESSION_UUID,
+});
+/**
+ * Stable key for "which project" a session belongs to (spec §5.4).
+ * `CLAUDE_PROJECT_DIR` is documented and survives `--resume`/context
+ * compaction, unlike `process.cwd()`; `repo.remoteUrl` survives the repo
+ * being moved or re-cloned to a different path; `cwd` is the last resort.
+ */
+export function resolveProjectKey(cwd, repo) {
+    return process.env.CLAUDE_PROJECT_DIR ?? repo?.remoteUrl ?? cwd;
+}
+/** Last two `/`-joined path segments of `cwd`, tolerating either path separator. Never absolute (F-9). */
+function lastTwoSegments(cwd) {
+    const segments = cwd.split(/[\\/]/).filter(Boolean);
+    return segments.slice(-2).join('/');
+}
+/**
+ * Compose the session-tier display label per spec §5.4:
+ * `<repoName> · <branch> · <first-4-of-id>`. A raw session id/UUID on its own
+ * is meaningless in a message list, so this always folds in repo context
+ * when one is available — preferring `CLAUDE_PROJECT_DIR` as the directory to
+ * inspect since it is stable across `--resume`/compaction, unlike `cwd` —
+ * and falls back to the path tier's own last-two-segments heuristic when
+ * that directory isn't a git repo at all.
+ */
+/**
+ * The discriminating part of a session id.
+ *
+ * Claude Code's bridge ids are all shaped `session_<opaque>`, so taking the
+ * first four characters of one yields the literal `sess` for every session on
+ * every machine — a disambiguator that disambiguates nothing, which is the
+ * whole job this suffix exists to do. Minted UUIDs have no such prefix and are
+ * unaffected.
+ *
+ * Stripping a known prefix rather than, say, slicing from the end keeps the
+ * suffix recognisable as the head of an id a user can match against a real
+ * session, and leaves the UUID case byte-for-byte as it was.
+ */
+function shortSessionId(sessionId) {
+    return sessionId.replace(/^session_/, '').slice(0, 4);
+}
+function composeSessionLabel(cwd, sessionId) {
+    const shortId = shortSessionId(sessionId);
+    const repo = detectRepoContext(process.env.CLAUDE_PROJECT_DIR ?? cwd);
+    if (repo)
+        return `${repo.name} · ${repo.branch} · ${shortId}`;
+    return `${lastTwoSegments(cwd)} · ${shortId}`;
+}
+/**
+ * Resolve a display-ready sender identity for an outgoing message, in
+ * precedence order: session name override > linked-worktree branch > path
+ * fallback.
+ *
+ * Purely a function of its arguments — never reads `process.cwd()` or
+ * `os.hostname()` itself, so callers control (and tests can mock) both `cwd`
+ * and `deviceName`; per-tool cwd rules live at each call site.
+ */
+export function resolveSenderIdentity(cwd, deviceName, sessionResolver = defaultSessionNameResolver) {
+    const sessionName = sessionResolver();
+    if (sessionName !== null)
+        return { label: composeSessionLabel(cwd, sessionName), source: 'session' };
+    if (isLinkedWorktree(cwd)) {
+        const branch = detectRepoContext(cwd)?.branch;
+        if (branch)
+            return { label: `${deviceName} - ${branch}`, source: 'worktree' };
+        // isLinkedWorktree true but no branch (race/edge case) — fall through rather
+        // than emit a malformed label.
+    }
+    return { label: `${deviceName} ${lastTwoSegments(cwd)}`, source: 'path' };
+}
+//# sourceMappingURL=identity.js.map

package/dist/identity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"identity.js","sourceRoot":"","sources":["../src/identity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAMvE,iEAAiE;AACjE,MAAM,oBAAoB,GAAG,UAAU,EAAE,CAAC;AAE1C;;;;;;;;;GASG;AACH,MAAM,UAAU,uBAAuB,CAAC,IAGvC;IACC,IAAI,QAAQ,GAAkB,IAAI,CAAC;IACnC,OAAO,GAAG,EAAE;QACV,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YACtB,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,6BAA6B,IAAI,IAAI,CAAC,UAAU,CAAC;QACvE,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,0BAA0B,GAAwB,uBAAuB,CAAC;IACrF,GAAG,EAAE,OAAO,CAAC,GAAG;IAChB,UAAU,EAAE,oBAAoB;CACjC,CAAC,CAAC;AAEH;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAC,GAAW,EAAE,IAAwB;IACrE,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,IAAI,EAAE,SAAS,IAAI,GAAG,CAAC;AAClE,CAAC;AAED,0GAA0G;AAC1G,SAAS,eAAe,CAAC,GAAW;IAClC,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACpD,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACtC,CAAC;AAED;;;;;;;;GAQG;AACH;;;;;;;;;;;;GAYG;AACH,SAAS,cAAc,CAAC,SAAiB;IACvC,OAAO,SAAS,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACxD,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAW,EAAE,SAAiB;IACzD,MAAM,OAAO,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;IAC1C,MAAM,IAAI,GAAG,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,GAAG,CAAC,CAAC;IACtE,IAAI,IAAI;QAAE,OAAO,GAAG,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,MAAM,MAAM,OAAO,EAAE,CAAC;IAC9D,OAAO,GAAG,eAAe,CAAC,GAAG,CAAC,MAAM,OAAO,EAAE,CAAC;AAChD,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,qBAAqB,CACnC,GAAW,EACX,UAAkB,EAClB,kBAAuC,0BAA0B;IAEjE,MAAM,WAAW,GAAG,eAAe,EAAE,CAAC;IACtC,IAAI,WAAW,KAAK,IAAI;QAAE,OAAO,EAAE,KAAK,EAAE,mBAAmB,CAAC,GAAG,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAErG,IAAI,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1B,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAC9C,IAAI,MAAM;YAAE,OAAO,EAAE,KAAK,EAAE,GAAG,UAAU,MAAM,MAAM,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;QAC9E,6EAA6E;QAC7E,+BAA+B;IACjC,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,GAAG,UAAU,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC5E,CAAC"}

package/dist/mcp-server.d.ts

@@ -4,10 +4,13 @@ export declare class HumanInTheLoopServer {
     private server;
     private transport;
     private config;
+    private autoLaunchClient;
     /** reviewIds still waiting on a human, so a graceful exit can release them (D-3). */
     private outstandingReviews;
     /** `config` is injectable so a test can construct a server without a real ~/.hitl. */
-    constructor(config?: HitlConfig);
+    constructor(config?: HitlConfig, options?: {
+        autoLaunchClient?: boolean;
+    });
     private setupHandlers;
     /**
      * ReviewPlan: snapshot a markdown plan, publish it for line-anchored review,
@@ -30,6 +33,17 @@ export declare class HumanInTheLoopServer {
      */
     private consumeReviewResponse;
     private downloadResponseBody;
+    /**
+     * Publish the sender's own identity as a companion to a question or
+     * notification just published, unless the operator opted out.
+     *
+     * Shared by AskUserQuestion and Notify — both resolve identity from
+     * `process.cwd()` (ReviewPlan resolves from the plan's own directory
+     * instead, so it is not part of this shared path). Decoration only: never
+     * lets a publish failure escape past the tool call it decorates, matching
+     * `publishAck`'s log-and-continue pattern below.
+     */
+    private publishSenderIdentityFor;
     /** Tell the client whether its submission actually landed. */
     private publishAck;
     /**
@@ -53,4 +67,7 @@ export declare class HumanInTheLoopServer {
     /** Publish cancel_review for every review still waiting on a human. */
     private cancelOutstandingReviews;
 }
+export declare function parseServerOptions(args: string[]): {
+    autoLaunchClient: boolean;
+};
 //# sourceMappingURL=mcp-server.d.ts.map

package/dist/mcp-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-server.d.ts","sourceRoot":"","sources":["../src/mcp-server.ts"],"names":[],"mappings":";AAcA,OAAO,KAAK,EAaV,UAAU,EAEX,MAAM,YAAY,CAAC;AAsDpB,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,MAAM,CAAa;IAC3B,qFAAqF;IACrF,OAAO,CAAC,kBAAkB,CAAqB;IAE/C,sFAAsF;gBAC1E,MAAM,GAAE,UAAyB;IAY7C,OAAO,CAAC,aAAa;IA4brB;;;OAGG;YACW,gBAAgB;IA0J9B;;;;OAIG;IACH,OAAO,CAAC,YAAY;IAIpB;;;;;;;OAOG;YACW,qBAAqB;YAiErB,oBAAoB;IAUlC,8DAA8D;YAChD,UAAU;IAuBxB;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;IAUrB;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc;IAyBhB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B1B,uEAAuE;YACzD,wBAAwB;CAkBvC"}
+{"version":3,"file":"mcp-server.d.ts","sourceRoot":"","sources":["../src/mcp-server.ts"],"names":[],"mappings":";AAcA,OAAO,KAAK,EAaV,UAAU,EAGX,MAAM,YAAY,CAAC;AAuDpB,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,gBAAgB,CAAU;IAClC,qFAAqF;IACrF,OAAO,CAAC,kBAAkB,CAAqB;IAE/C,sFAAsF;gBAEpF,MAAM,GAAE,UAAyB,EACjC,OAAO,GAAE;QAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;KAAO;IAc9C,OAAO,CAAC,aAAa;IAicrB;;;OAGG;YACW,gBAAgB;IAmK9B;;;;OAIG;IACH,OAAO,CAAC,YAAY;IAIpB;;;;;;;OAOG;YACW,qBAAqB;YAiErB,oBAAoB;IAUlC;;;;;;;;;OASG;YACW,wBAAwB;IAmBtC,8DAA8D;YAChD,UAAU;IAuBxB;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;IAYrB;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc;IAyBhB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B1B,uEAAuE;YACzD,wBAAwB;CAkBvC;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG;IAAE,gBAAgB,EAAE,OAAO,CAAA;CAAE,CAEhF"}

package/dist/mcp-server.js

@@ -10,6 +10,7 @@ import { PROTOCOL_VERSION } from './types.js';
 import { NtfyTransport, AttachmentExpiredError, AbortedWaitError } from './ntfy-transport.js';
 import { loadConfig } from './config.js';
 import { detectRepoContext } from './git-context.js';
+import { resolveSenderIdentity } from './identity.js';
 import { performSetup, ensureClientRunning } from './setup.js';
 import { SERVER_VERSION } from './version.js';
 import { readPlanFile, PlanFileError } from './plan-file.js';
@@ -51,11 +52,13 @@ export class HumanInTheLoopServer {
     server;
     transport;
     config;
+    autoLaunchClient;
     /** reviewIds still waiting on a human, so a graceful exit can release them (D-3). */
     outstandingReviews = new Set();
     /** `config` is injectable so a test can construct a server without a real ~/.hitl. */
-    constructor(config = loadConfig()) {
+    constructor(config = loadConfig(), options = {}) {
         this.config = config;
+        this.autoLaunchClient = options.autoLaunchClient ?? true;
         this.server = new Server({ name: SERVER_NAME, version: SERVER_VERSION }, { capabilities: { tools: {} } });
         this.transport = new NtfyTransport(this.config);
         this.setupHandlers();
@@ -288,7 +291,9 @@ Blocking past 60 seconds requires the calling MCP host to opt into resetTimeoutO
             // Handle setup tool
             if (request.params.name === SETUP_TOOL_NAME) {
                 try {
-                    const result = await performSetup(SERVER_DIR);
+                    const result = await performSetup(SERVER_DIR, {
+                        autoLaunchClient: this.autoLaunchClient,
+                    });
                     return {
                         content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
                     };
@@ -314,6 +319,7 @@ Blocking past 60 seconds requires the calling MCP host to opt into resetTimeoutO
                         context: args.context || undefined,
                     };
                     await this.transport.publish(notification);
+                    await this.publishSenderIdentityFor(notification.messageId, 'notification');
                     return {
                         content: [{ type: 'text', text: JSON.stringify({ success: true, messageId: notification.messageId }) }],
                     };
@@ -381,6 +387,7 @@ Blocking past 60 seconds requires the calling MCP host to opt into resetTimeoutO
                 console.error(`Publishing question ${questionMsg.messageId} to ntfy...`);
                 await this.transport.publish(questionMsg);
                 console.error('Question published. Waiting for answer...');
+                await this.publishSenderIdentityFor(questionMsg.messageId, 'question');
                 this.transport.pending.record({
                     kind: 'question',
                     id: questionMsg.messageId,
@@ -506,6 +513,12 @@ Blocking past 60 seconds requires the calling MCP host to opt into resetTimeoutO
         const reviewId = resumable?.id ?? uuidv4();
         const body = { content: plan.content, diff };
         const encoded = encodePayload(body, this.config.encryptionKey);
+        // Resolved from the plan's own directory, matching the `repo` field just
+        // above — not process.cwd(), and not named `identity` since that local is
+        // already bound to `resolvePlanIdentity(...)` a few lines up.
+        const senderIdentity = this.config.identityEnabled !== false
+            ? resolveSenderIdentity(path.dirname(plan.resolvedPath), this.config.deviceName)
+            : undefined;
         const reviewMsg = {
             type: 'plan_review',
             messageId: reviewId,
@@ -518,6 +531,7 @@ Blocking past 60 seconds requires the calling MCP host to opt into resetTimeoutO
             planId: identity.planId,
             revision: recorded.revision,
             isNewPlan: recorded.isNewPlan,
+            sender: senderIdentity,
             snapshotHash,
             body: encoded.ref,
         };
@@ -648,6 +662,32 @@ Blocking past 60 seconds requires the calling MCP host to opt into resetTimeoutO
         }
         return await this.transport.downloadAttachment(attachment);
     }
+    /**
+     * Publish the sender's own identity as a companion to a question or
+     * notification just published, unless the operator opted out.
+     *
+     * Shared by AskUserQuestion and Notify — both resolve identity from
+     * `process.cwd()` (ReviewPlan resolves from the plan's own directory
+     * instead, so it is not part of this shared path). Decoration only: never
+     * lets a publish failure escape past the tool call it decorates, matching
+     * `publishAck`'s log-and-continue pattern below.
+     */
+    async publishSenderIdentityFor(forMessageId, forType) {
+        if (this.config.identityEnabled === false)
+            return;
+        try {
+            const senderIdentity = resolveSenderIdentity(process.cwd(), this.config.deviceName);
+            await this.transport.publishSenderIdentity({
+                type: 'sender_identity',
+                forMessageId,
+                forType,
+                sender: senderIdentity,
+            });
+        }
+        catch (err) {
+            console.error(`Could not publish sender identity for ${forMessageId}: ${err}`);
+        }
+    }
     /** Tell the client whether its submission actually landed. */
     async publishAck(reviewId, responseId, status, reason) {
         const ack = {
@@ -675,6 +715,8 @@ Blocking past 60 seconds requires the calling MCP host to opt into resetTimeoutO
      * window to explain why (A-10).
      */
     requireClient() {
+        if (!this.autoLaunchClient)
+            return;
         const result = ensureClientRunning(SERVER_DIR);
         if (!result.ok) {
             throw new McpError(ErrorCode.InternalError, `No HITL client available, so nobody would see this. ${result.reason ?? ''}`.trim());
@@ -754,6 +796,9 @@ Blocking past 60 seconds requires the calling MCP host to opt into resetTimeoutO
         this.outstandingReviews.clear();
     }
 }
+export function parseServerOptions(args) {
+    return { autoLaunchClient: !args.includes('--no-auto-launch-client') };
+}
 /**
  * True when this file is what node was asked to run, rather than something
  * another module imported.
@@ -775,7 +820,7 @@ function isDirectlyExecuted() {
     }
 }
 if (isDirectlyExecuted()) {
-    const server = new HumanInTheLoopServer();
+    const server = new HumanInTheLoopServer(loadConfig(), parseServerOptions(process.argv.slice(2)));
     server.run().catch((error) => {
         console.error('Server error:', error);
         process.exit(1);