kimaki 1.3.0 → 1.4.0

package/dist/tunnel.js

@@ -4,14 +4,13 @@
 // profile in $XDG_DATA_HOME/opentunnel, shared with the opentunnel CLI.
 import crypto from 'node:crypto';
 import { execFile, spawn } from 'node:child_process';
+import http from 'node:http';
 import net from 'node:net';
 import { setTimeout as sleep } from 'node:timers/promises';
 import { promisify, stripVTControlCharacters } from 'node:util';
-import { create as createOpenTunnel } from '@opentunnel/client';
+import { create as createOpenTunnel, isValidRouteName, OpenTunnelClientError, publicUrl, } from '@opentunnel/client';
 const execFileAsync = promisify(execFile);
-const ROUTE_NAME = /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/;
 const PORT_WAIT_MS = 30_000;
-const ATTACH_TIMEOUT_MS = 60_000;
 const CHILD_KILL_GRACE_MS = 5_000;
 // Only lines with host:port, so "Port 5173 is in use" does not match.
 const LOCAL_PORT_PATTERN = /(?:https?:\/\/)?(?:localhost|127\.0\.0\.1|0\.0\.0\.0|\[::\]):(\d{1,5})/i;
@@ -27,14 +26,29 @@ export function detectPortFromText(text) {
     }
     return null;
 }
+// Traforo accepted any tunnel ID, so map it to a DNS label instead of failing: `My_App` becomes `my-app`.
+function toRouteLabel(raw) {
+    const label = raw.toLowerCase().replace(/[^a-z0-9-]+/g, '-').replace(/^-+|-+$/g, '').slice(0, 63).replace(/-+$/, '');
+    return isValidRouteName(label) ? label : '';
+}
 // Explicit name, then the tuistory session ID (stable URL across restarts of one session), then random.
 export function routeName({ name, tuistorySessionId }) {
     if (name)
-        return ROUTE_NAME.test(name) ? name : new Error(`Invalid tunnel ID ${JSON.stringify(name)}: use lowercase letters, digits and dashes`);
-    const fromSession = tuistorySessionId?.toLowerCase();
-    if (fromSession && ROUTE_NAME.test(fromSession))
-        return fromSession;
-    return crypto.randomBytes(8).toString('hex');
+        return toRouteLabel(name) || new Error(`Invalid tunnel ID ${JSON.stringify(name)}: use letters, digits and dashes`);
+    return toRouteLabel(tuistorySessionId ?? '') || crypto.randomBytes(8).toString('hex');
+}
+// Parses `netstat -ano` output on Windows: `TCP  0.0.0.0:5173  0.0.0.0:0  LISTENING  1234`.
+export function parseNetstatListeningPids({ stdout, port }) {
+    const pids = new Set();
+    for (const line of stdout.split('\n')) {
+        const [protocol, local, , state, pid] = line.trim().split(/\s+/);
+        if (protocol !== 'TCP' || state !== 'LISTENING' || !local?.endsWith(`:${port}`))
+            continue;
+        const parsed = Number(pid);
+        if (Number.isInteger(parsed) && parsed > 0)
+            pids.add(parsed);
+    }
+    return [...pids];
 }
 function isPortInUse({ port, host }) {
     return new Promise((resolve) => {
@@ -51,6 +65,10 @@ async function waitForPort({ port, host, signal }) {
     }
 }
 async function listeningPids(port) {
+    if (process.platform === 'win32') {
+        const { stdout } = await execFileAsync('netstat', ['-ano'], { timeout: 5_000 }).catch(() => ({ stdout: '' }));
+        return parseNetstatListeningPids({ stdout, port });
+    }
     const { stdout } = await execFileAsync('lsof', ['-ti', `tcp:${port}`, '-sTCP:LISTEN'], { timeout: 5_000 }).catch(() => ({ stdout: '' }));
     return stdout.split('\n').map(Number).filter((pid) => Number.isInteger(pid) && pid > 0);
 }
@@ -104,6 +122,69 @@ function killChild(child, signal = 'SIGTERM') {
     });
 }
 const log = (line) => process.stderr.write(`${line}\n`);
+function logTunnelEvent(event) {
+    if (event.type === 'disconnected')
+        log(`Tunnel disconnected: ${event.reason}`);
+    if (event.type === 'connected')
+        log('Tunnel connected');
+}
+function forwardedHeaders({ headers, target }) {
+    return {
+        ...headers,
+        host: target,
+        'x-forwarded-host': headers['x-forwarded-host'] ?? headers.host,
+        'x-forwarded-proto': headers['x-forwarded-proto'] ?? 'https',
+    };
+}
+function rawResponseHead(response) {
+    let head = `HTTP/1.1 ${response.statusCode} ${response.statusMessage}\r\n`;
+    for (let i = 0; i < response.rawHeaders.length; i += 2)
+        head += `${response.rawHeaders[i]}: ${response.rawHeaders[i + 1]}\r\n`;
+    return `${head}\r\n`;
+}
+// opentunnel forwards the raw bytes, so the app would see the public Host header. Vite and other dev
+// servers reject unknown hosts (DNS rebinding protection) with 403. This loopback proxy sends
+// Host: localhost:<port> and keeps the public host in X-Forwarded-Host, like traforo did.
+export function startHostProxy({ host, port }) {
+    const target = `${host}:${port}`;
+    const server = http.createServer((req, res) => {
+        const upstream = http.request({ host, port, method: req.method, path: req.url, headers: forwardedHeaders({ headers: req.headers, target }) }, (response) => {
+            res.writeHead(response.statusCode ?? 502, response.statusMessage, response.rawHeaders);
+            response.pipe(res);
+        });
+        upstream.on('error', () => {
+            if (!res.headersSent)
+                res.writeHead(502);
+            res.end();
+        });
+        req.pipe(upstream);
+    });
+    // WebSocket upgrades (Vite HMR): replay the handshake upstream, then pipe both sockets.
+    server.on('upgrade', (req, socket, head) => {
+        const upstream = http.request({ host, port, method: req.method, path: req.url, headers: forwardedHeaders({ headers: req.headers, target }) });
+        upstream.on('upgrade', (response, upstreamSocket, upstreamHead) => {
+            socket.write(rawResponseHead(response));
+            if (upstreamHead.length > 0)
+                socket.write(upstreamHead);
+            if (head.length > 0)
+                upstreamSocket.write(head);
+            upstreamSocket.on('error', () => socket.destroy());
+            socket.on('error', () => upstreamSocket.destroy());
+            upstreamSocket.pipe(socket).pipe(upstreamSocket);
+        });
+        upstream.on('response', (response) => {
+            socket.write(rawResponseHead(response));
+            response.pipe(socket);
+        });
+        upstream.on('error', () => socket.destroy());
+        socket.on('error', () => upstream.destroy());
+        upstream.end();
+    });
+    return new Promise((resolve) => {
+        server.once('error', (cause) => resolve(new Error('Could not start the tunnel proxy', { cause })));
+        server.listen(0, '127.0.0.1', () => resolve(server));
+    });
+}
 export async function runTunnel(options) {
     const host = options.host ?? 'localhost';
     const route = routeName({ name: options.name, tuistorySessionId: process.env['TUISTORY_SESSION_ID'] });
@@ -120,13 +201,20 @@ export async function runTunnel(options) {
         return new Error(`Port ${options.port} is already in use. Pass --kill to stop the process on it first`);
     }
     const client = createOpenTunnel();
-    const existing = await client.tunnel.get().catch(() => undefined);
-    if (!existing)
-        log('Creating the opentunnel.xyz tunnel of this machine (waits for a certificate, up to a minute)...');
-    const identity = await client.tunnel.ensure().catch((cause) => new Error('Could not create the opentunnel tunnel', { cause }));
+    let waitLogged = false;
+    const identity = await client.tunnel
+        .ensure({
+        onProgress: (stage) => {
+            if (waitLogged || stage === 'checking-certificate' || stage === 'ready')
+                return;
+            waitLogged = true;
+            log('Getting a certificate for the opentunnel.xyz tunnel of this machine (up to a minute)...');
+        },
+    })
+        .catch((cause) => new Error('Could not create the opentunnel tunnel', { cause }));
     if (identity instanceof Error)
         return identity;
-    const url = `https://${route}.${identity.hostname}`;
+    const url = publicUrl(route, identity.hostname);
     let child;
     let connection;
     // Set before we kill the child ourselves, so its exit does not end the process first.
@@ -183,24 +271,25 @@ export async function runTunnel(options) {
     const ready = await waitForPort({ port, host, signal: portSignal });
     if (ready instanceof Error)
         return fail(ready);
-    // connect retries route_conflict forever, so a route held by another process would hang here.
-    const connecting = client.tunnel.connect({ routes: { [route]: `${host}:${port}` } });
-    const timeout = sleep(ATTACH_TIMEOUT_MS, null, { ref: false });
-    const attached = await Promise.race([connecting, timeout]).catch((cause) => new Error('Could not connect the tunnel', { cause }));
+    const proxy = await startHostProxy({ host, port });
+    if (proxy instanceof Error)
+        return fail(proxy);
+    const proxyAddress = proxy.address();
+    if (!proxyAddress || typeof proxyAddress === 'string')
+        return fail(new Error('Tunnel proxy has no TCP address'));
+    const attached = await client.tunnel
+        .connect({ routes: { [route]: `127.0.0.1:${proxyAddress.port}` }, onRouteConflict: 'fail', onEvent: logTunnelEvent })
+        .catch((cause) => {
+        if (cause instanceof OpenTunnelClientError && cause.code === 'route_conflict') {
+            return new Error(`Tunnel ID ${route} is already used by another process. Pass a different -t`, { cause });
+        }
+        return new Error('Could not connect the tunnel', { cause });
+    });
     if (attached instanceof Error)
         return fail(attached);
-    if (!attached)
-        return fail(new Error(`Tunnel did not attach in ${ATTACH_TIMEOUT_MS / 1000}s. Another process may use the tunnel ID ${route}`));
     connection = attached;
-    process.stdout.write(`\nLocal:  http://${host}:${port}\nTunnel: ${url}\n\n`);
-    void (async () => {
-        for await (const event of attached.events) {
-            if (event.type === 'disconnected')
-                log(`Tunnel disconnected: ${event.reason}`);
-            if (event.type === 'connected')
-                log('Tunnel connected');
-        }
-    })();
+    process.stdout.write(`\nLocal:  http://${host}:${port}\nTunnel: ${url}\n` +
+        `Agents: validate with the Local URL (playwriter, curl), it is much faster. The Tunnel URL is for the user.\n\n`);
     const closed = await attached.closed.then(() => undefined, (cause) => new Error('Tunnel stopped', { cause }));
     return fail(closed ?? new Error('Tunnel stopped'));
 }

package/dist/tunnel.js.map

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

package/dist/tunnel.test.js

@@ -1,5 +1,10 @@
+import fs from 'node:fs';
+import http from 'node:http';
+import os from 'node:os';
+import path from 'node:path';
+import { createServer } from 'vite';
 import { expect, test } from 'vitest';
-import { detectPortFromText, routeName } from "./tunnel.js";
+import { detectPortFromText, parseNetstatListeningPids, routeName, startHostProxy } from "./tunnel.js";
 test('detects the dev server port and skips noise lines', () => {
     const vite = '\u001b[33mPort 5173 is in use, trying another one...\u001b[39m\n  ➜  Local:   \u001b[36mhttp://localhost:\u001b[1m5174\u001b[22m/\u001b[39m\n';
     expect({
@@ -23,16 +28,87 @@ test('detects the dev server port and skips noise lines', () => {
 test('route name: explicit, then tuistory session, then random', () => {
     expect({
         explicit: routeName({ name: 'docs', tuistorySessionId: 'abc123' }),
-        invalid: String(routeName({ name: 'Bad_Name' })),
-        tuistory: routeName({ tuistorySessionId: 'ABC123' }),
+        normalized: routeName({ name: '_My_App.dev_' }),
+        invalid: String(routeName({ name: '___' })),
+        tuistory: routeName({ tuistorySessionId: 'Holocron_Dev' }),
+        tuistoryInvalid: String(routeName({ tuistorySessionId: '___' })).length,
         random: String(routeName({})).length,
     }).toMatchInlineSnapshot(`
     {
       "explicit": "docs",
-      "invalid": "Error: Invalid tunnel ID "Bad_Name": use lowercase letters, digits and dashes",
+      "invalid": "Error: Invalid tunnel ID "___": use letters, digits and dashes",
+      "normalized": "my-app-dev",
       "random": 16,
-      "tuistory": "abc123",
+      "tuistory": "holocron-dev",
+      "tuistoryInvalid": 16,
     }
   `);
 });
+test('netstat listening pids on Windows', () => {
+    const stdout = [
+        'Active Connections',
+        '  Proto  Local Address          Foreign Address        State           PID',
+        '  TCP    0.0.0.0:5173           0.0.0.0:0              LISTENING       1234',
+        '  TCP    [::]:5173              [::]:0                 LISTENING       1234',
+        '  TCP    127.0.0.1:51730        0.0.0.0:0              LISTENING       999',
+        '  TCP    127.0.0.1:5173         127.0.0.1:60000        ESTABLISHED     777',
+        '  UDP    0.0.0.0:5173           *:*                                    555',
+    ].join('\r\n');
+    expect(parseNetstatListeningPids({ stdout, port: 5173 })).toMatchInlineSnapshot(`
+    [
+      1234,
+    ]
+  `);
+});
+function request({ port, headers }) {
+    return new Promise((resolve, reject) => {
+        const req = http.request({ host: '127.0.0.1', port, path: '/', headers });
+        req.on('response', (res) => {
+            res.resume();
+            resolve(String(res.statusCode));
+            req.destroy();
+        });
+        req.on('upgrade', (res, socket) => {
+            resolve(`${res.statusCode} ${res.headers['sec-websocket-protocol']}`);
+            socket.destroy();
+        });
+        req.on('error', reject);
+        req.end();
+    });
+}
+test('host proxy lets the public tunnel host through Vite host check, HMR included', async () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), 'kimaki-tunnel-'));
+    fs.writeFileSync(path.join(root, 'index.html'), '<p>hi</p>');
+    const vite = await createServer({ root, configFile: false, logLevel: 'silent', server: { host: '127.0.0.1', port: 0 } });
+    await vite.listen();
+    const address = vite.httpServer.address();
+    if (!address || typeof address === 'string')
+        throw new Error('no vite address');
+    const proxy = await startHostProxy({ host: '127.0.0.1', port: address.port });
+    if (proxy instanceof Error)
+        throw proxy;
+    const proxyAddress = proxy.address();
+    if (!proxyAddress || typeof proxyAddress === 'string')
+        throw new Error('no proxy address');
+    const publicHost = { host: 'docs.abc.opentunnel.xyz' };
+    const hmr = { ...publicHost, connection: 'Upgrade', upgrade: 'websocket', 'sec-websocket-version': '13', 'sec-websocket-key': 'dGhlIHNhbXBsZSBub25jZQ==', 'sec-websocket-protocol': 'vite-hmr' };
+    try {
+        expect({
+            direct: await request({ port: address.port, headers: publicHost }),
+            proxied: await request({ port: proxyAddress.port, headers: publicHost }),
+            proxiedHmr: await request({ port: proxyAddress.port, headers: hmr }),
+        }).toMatchInlineSnapshot(`
+      {
+        "direct": "403",
+        "proxied": "200",
+        "proxiedHmr": "101 vite-hmr",
+      }
+    `);
+    }
+    finally {
+        proxy.close();
+        await vite.close();
+        fs.rmSync(root, { recursive: true, force: true });
+    }
+});
 //# sourceMappingURL=tunnel.test.js.map

package/dist/tunnel.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"tunnel.test.js","sourceRoot":"","sources":["../src/tunnel.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AACrC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAE3D,IAAI,CAAC,mDAAmD,EAAE,GAAG,EAAE;IAC7D,MAAM,IAAI,GAAG,+IAA+I,CAAA;IAC5J,MAAM,CAAC;QACL,IAAI,EAAE,kBAAkB,CAAC,IAAI,CAAC;QAC9B,IAAI,EAAE,kBAAkB,CAAC,0CAA0C,CAAC;QACpE,IAAI,EAAE,kBAAkB,CAAC,gCAAgC,CAAC;QAC1D,SAAS,EAAE,kBAAkB,CAAC,+EAA+E,CAAC;QAC9G,UAAU,EAAE,kBAAkB,CAAC,8BAA8B,CAAC;QAC9D,QAAQ,EAAE,kBAAkB,CAAC,qBAAqB,CAAC;KACpD,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;GASxB,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,0DAA0D,EAAE,GAAG,EAAE;IACpE,MAAM,CAAC;QACL,QAAQ,EAAE,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE,QAAQ,EAAE,CAAC;QAClE,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;QAChD,QAAQ,EAAE,SAAS,CAAC,EAAE,iBAAiB,EAAE,QAAQ,EAAE,CAAC;QACpD,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM;KACrC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;GAOxB,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"tunnel.test.js","sourceRoot":"","sources":["../src/tunnel.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kimaki",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "A collaborative agent orchestrator for OpenCode, inside Discord",
   "repository": "https://github.com/remorses/kimaki",
   "type": "module",
@@ -20,7 +20,7 @@
     "@libsql/client": "^0.17.2",
     "@opencode/client": "2.0.29",
     "@opencode/plugin": "2.0.29",
-    "@opentunnel/client": "0.5.2",
+    "@opentunnel/client": "0.6.0",
     "@strada.sh/sdk": "^0.8.0",
     "cron-parser": "^5.5.0",
     "discord-api-types": "^0.38.40",
@@ -52,8 +52,8 @@
     "typescript": "^5.9.2",
     "vitest": "^3.2.4",
     "ws": "^8.18.0",
-    "discord-digital-twin": "^0.1.2",
-    "opencode-deterministic-provider": "^0.0.1"
+    "opencode-deterministic-provider": "^0.0.1",
+    "discord-digital-twin": "^0.1.2"
   },
   "scripts": {
     "build": "tsc",

package/skills/kimaki-tunnel/SKILL.md

@@ -1,16 +1,17 @@
 ---
 name: kimaki-tunnel
-description: Share a local dev server with the user through a public URL. Use when the user should open a localhost app in a browser, test a webhook or OAuth callback against a local server, or preview a dev server from Discord. Runs `kimaki tunnel` in a named background tuistory session. ALWAYS load before starting a dev server the user must open. Only for Kimaki Discord sessions.
+description: Share a local dev server with the user through a public URL. Localhost URLs are useless from Discord. Use when the user should open a localhost app in a browser, test a webhook or OAuth callback against a local server, or preview a dev server from Discord. Runs `kimaki tunnel` in a named background tuistory session. ALWAYS load before starting a dev server the user must open. Only for Kimaki Discord sessions.
 ---
 
 # Dev servers with tunnel access
 
 Localhost URLs are useless from Discord. Wrap the dev server in `kimaki tunnel` to get a public `https://<name>.<id>.opentunnel.xyz` URL, and run it in a named background `tuistory` session so you can wait for output, read logs and stop it later. Name the session descriptively (e.g. `projectname-dev`) and reuse it. Run `tuistory --help` first (or `bunx tuistory` when it is not installed). Invoke `kimaki` directly, not via `npx` or `bunx`.
 
+- **Validate on localhost.** The agent runs on the same machine as the server, so playwriter, curl and tests must use the `Local:` URL. It is much faster. The tunnel URL is only for the user.
 - Use random names by default. Pass `-t <name>` only for services that are safe to be publicly discoverable.
 - `kimaki tunnel` detects the local port from the child output. Pass `--port` only when the server prints no detectable localhost URL.
 - `kimaki tunnel` injects `KIMAKI_TUNNEL_URL` into the child process. Wire the app to it so OAuth callbacks, webhook URLs and absolute links use the public URL.
-- TLS ends on this machine and the request reaches the app unchanged. Dev servers that check the `Host` header (Vite) must allow it, e.g. `server.allowedHosts: true` or `['.opentunnel.xyz']`.
+- The app gets `Host: localhost:<port>` and the public host in `X-Forwarded-Host`, so Vite needs no `allowedHosts` config.
 - The first run on a machine creates the tunnel and waits up to a minute for its certificate.
 
 ```bash

package/src/bot.ts

@@ -11,6 +11,7 @@ import { ChannelType, type Client, type TextChannel, type ThreadChannel } from '
 
 import type { AgentUi } from './agent-ui.ts'
 import type { Analytics } from './analytics.ts'
+import type { PromptSection } from './builtin-skills.ts'
 import type { KimakiDb } from './db.ts'
 import type { EffectsRunner } from './effects.ts'
 import { ConfigError, DbError, DiscordError, OpenCodeError, OpenCodeUnavailableError } from './errors.ts'
@@ -69,8 +70,8 @@ export type Bot = {
   allowAllUsers: boolean
   // Built-in skill ids (builtin-skills.ts) denied through the permissions of new sessions.
   disabledSkills: readonly string[]
-  // `kimaki --message-tool`: root sessions also reply through send_message; Discord hides their plain text.
-  messageTool: boolean
+  // `kimaki --disable-prompt`: static instruction parts left out of new sessions.
+  disabledPrompt: readonly PromptSection[]
   features: BotFeatures
 }
 
@@ -136,7 +137,6 @@ export type SessionMarker = {
   fields: { readonly [key: string]: JsonValue }
   dataDir: string | null
   lockPort: number | null
-  messageTool: boolean
   // Explicit `kimaki send --parent-session`, so /resume keeps the instruction line.
   parentSessionId: string | null
   // The scheduled run stored at session.create, so /resume keeps the same instruction section.
@@ -150,7 +150,7 @@ function jsonObject(value: JsonValue | undefined): { readonly [key: string]: Jso
 export function readMarker(metadata: SessionMetadata | undefined): SessionMarker | null {
   const fields = jsonObject(metadata?.['kimaki'])
   if (!fields) return null
-  const { dataDir, lockPort, messageTool, parentSessionId } = fields
+  const { dataDir, lockPort, parentSessionId } = fields
   const task = jsonObject(fields['task'])
   const taskId = task?.['id']
   const cronExpr = task?.['cronExpr']
@@ -159,7 +159,6 @@ export function readMarker(metadata: SessionMetadata | undefined): SessionMarker
     fields,
     dataDir: typeof dataDir === 'string' ? dataDir : null,
     lockPort: typeof lockPort === 'number' ? lockPort : null,
-    messageTool: messageTool === true,
     parentSessionId: typeof parentSessionId === 'string' ? parentSessionId : null,
     task: typeof taskId === 'number'
       ? { id: taskId, cronExpr: typeof cronExpr === 'string' ? cronExpr : null, timezone: typeof timezone === 'string' ? timezone : null }
@@ -167,15 +166,9 @@ export function readMarker(metadata: SessionMetadata | undefined): SessionMarker
   }
 }
 
-// The marker fields that follow this bot run: where the agent's `kimaki` calls
-// go, and whether the plugin gives the session send_message.
-export function cliContext(bot: Pick<Bot, 'dataDir' | 'lockPort' | 'messageTool'>) {
-  return { dataDir: bot.dataDir, lockPort: bot.lockPort, messageTool: bot.messageTool }
-}
-
-// False when the session marker was written by another bot run or with another --message-tool.
-export function markerIsCurrent(bot: Pick<Bot, 'dataDir' | 'lockPort' | 'messageTool'>, marker: SessionMarker): boolean {
-  return marker.dataDir === bot.dataDir && marker.lockPort === bot.lockPort && marker.messageTool === bot.messageTool
+// The marker fields that point the agent's `kimaki` calls at this bot.
+export function cliContext(bot: Bot) {
+  return { dataDir: bot.dataDir, lockPort: bot.lockPort }
 }
 
 // Default model of new sessions in channels without their own (/model "All channels").

package/src/builtin-skills.test.ts

@@ -1,6 +1,7 @@
 import { expect, test } from 'vitest'
 
-import { BUILTIN_SKILL_IDS, disabledSkillRules, parseDisabledSkills, readBuiltinSkills } from './builtin-skills.ts'
+import { BUILTIN_SKILL_IDS, disabledSkillRules, parseDisabledPromptSections, parseDisabledSkills, PROMPT_SECTIONS, readBuiltinSkills } from './builtin-skills.ts'
+import { baseInstructions } from './system-prompt.ts'
 
 test('every built-in skill file parses', async () => {
   const skills = await readBuiltinSkills()
@@ -27,3 +28,75 @@ test('--disable-skills accepts all, a list, and rejects unknown ids', () => {
     ]
   `)
 })
+
+test('--disable-prompt removes exactly the headings of each section', () => {
+  expect(parseDisabledPromptSections(['critique-diffs,discord-callouts', 'search-result-urls'])).toEqual(['critique-diffs', 'discord-callouts', 'search-result-urls'])
+  expect(parseDisabledPromptSections(['critique'])).toBeInstanceOf(Error)
+  const input = { sessionId: 'ses_1', threadId: '2', channelId: '3', guildId: '4', userId: '5', dataDir: '/data', channelTopic: null, agents: [], parentSessionId: null }
+  const headings = (text: string) => text.split('\n').filter((line) => line.startsWith('## '))
+  const full = headings(baseInstructions(input))
+  const removed = Object.fromEntries(PROMPT_SECTIONS.map((section) => {
+    const kept = new Set(headings(baseInstructions({ ...input, disabled: [section] })))
+    return [section, full.filter((heading) => !kept.has(heading))]
+  }))
+  expect(removed).toMatchInlineSnapshot(`
+    {
+      "action-buttons": [
+        "## action buttons",
+        "## ending conversations with options",
+      ],
+      "ascii-diagrams": [
+        "## diagrams",
+      ],
+      "critique-diffs": [
+        "## showing diffs",
+      ],
+      "cross-project-commands": [
+        "## cross-project commands",
+      ],
+      "discord-callouts": [
+        "## Callouts in Kimaki Discord",
+        "## Tests not fully green",
+      ],
+      "discord-permissions": [
+        "## permissions",
+      ],
+      "file-upload-requests": [
+        "## requesting files from the user",
+      ],
+      "kimaki-debugging": [
+        "## debugging kimaki issues",
+      ],
+      "markdown-formatting": [
+        "## markdown formatting",
+      ],
+      "search-result-urls": [
+        "## URLs in search results",
+      ],
+      "session-abort": [
+        "## aborting a session",
+      ],
+      "session-sleep": [
+        "## sleeping the session",
+      ],
+      "waiting-sessions": [
+        "## waiting for a session to finish",
+      ],
+    }
+  `)
+  expect(headings(baseInstructions({ ...input, disabled: [...PROMPT_SECTIONS] }))).toMatchInlineSnapshot(`
+    [
+      "## Discord output",
+      "## shell tool",
+      "## commit messages",
+      "## uploading files to discord",
+      "## generating audio from text",
+      "## archiving the current thread",
+      "## updating the session title",
+      "## discord user mentions",
+      "## starting new sessions from CLI",
+      "## scheduled sends and routines",
+      "## reading other sessions",
+    ]
+  `)
+})

package/src/builtin-skills.ts

@@ -53,6 +53,39 @@ export function parseDisabledSkills(value: string | undefined): ConfigError | Bu
   return items as BuiltinSkillId[]
 }
 
+// Static parts of the session instructions (system-prompt.ts) that
+// `kimaki --disable-prompt <section>` removes. Here, not in system-prompt.ts,
+// so the CLI help can list them without loading zod.
+export const PROMPT_SECTIONS = [
+  'discord-permissions',
+  'kimaki-debugging',
+  'file-upload-requests',
+  'action-buttons',
+  'session-sleep',
+  'session-abort',
+  'cross-project-commands',
+  'waiting-sessions',
+  'critique-diffs',
+  'markdown-formatting',
+  'discord-callouts',
+  'search-result-urls',
+  'ascii-diagrams',
+] as const
+
+export type PromptSection = (typeof PROMPT_SECTIONS)[number]
+
+function isPromptSection(item: string): item is PromptSection {
+  return PROMPT_SECTIONS.some((section) => section === item)
+}
+
+// Repeatable flag; each value can also be a comma separated list.
+export function parseDisabledPromptSections(values: readonly string[] | undefined): ConfigError | PromptSection[] {
+  const items = (values ?? []).flatMap((value) => value.split(',')).map((item) => item.trim()).filter(Boolean)
+  const unknown = items.filter((item) => !isPromptSection(item))
+  if (unknown.length > 0) return new ConfigError({ reason: `Unknown prompt section ${unknown.join(', ')}. Choose from: ${PROMPT_SECTIONS.join(', ')}` })
+  return items.filter(isPromptSection)
+}
+
 // OpenCode hides a skill from the model and the skill tool when its permission is denied.
 export function disabledSkillRules(disabled: readonly string[]) {
   return disabled.map((id) => ({ action: 'skill', resource: id, effect: 'deny' }) as const)