feat: multi-instance session lease, write fencing, and fs/watch reliability

.changeset/cold-journal-inspection.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+Prevent cold session reads from replacing an event journal owned by another server instance.

.changeset/fix-ipv6-web-origin.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+Fix `kimi web` startup when binding to an IPv6 host.

.changeset/journal-fswatch-reliability-fixes.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+Fix `.gitignore` edits not taking effect until restart for file listing and file watching.

.changeset/multi-instance-session-sync.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+web: When several server instances share one home, opening a session held by another instance now redirects to that instance, and the session list refreshes automatically when a peer adds or removes sessions.

.changeset/session-event-release-barrier.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+web: Restore live event delivery after archiving and reopening a session.

.changeset/session-lease-write-fencing.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+Opening the same session from a second instance now fails with a clear ownership error, while shutdown blocks late writes and releases ambiguous closes through a dirty fallback.

.changeset/skill-hot-reload.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+Newly added or updated skills now take effect on the next turn without restarting, and the web skill list refreshes automatically.

.changeset/stale-write-fencing.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+Each agent now tracks its own file-read baselines and refuses to overwrite files, including active plan files, that changed on disk after its last read.

apps/kimi-code/.gitignore

@@ -8,4 +8,4 @@ agents/
 src/generated/vis-web-asset.ts
 
 # Copied from packages/pi-tui/native at build time by scripts/copy-native-assets.mjs
-native/
+/native/

apps/kimi-code/package.json

@@ -77,6 +77,7 @@
     "e2e:real": "pnpm -w run build:packages && KIMI_E2E_REAL=1 vitest run test/e2e/real-llm-smoke.e2e.test.ts",
     "postinstall": "node scripts/postinstall.mjs"
   },
+  "dependencies": {},
   "optionalDependencies": {
     "@mariozechner/clipboard": "^0.3.9",
     "node-pty": "^1.1.0"

apps/kimi-code/scripts/native/check-bundle.mjs

@@ -23,12 +23,10 @@ const optionalRuntimeRequires = new Set([
   'utf-8-validate',
 ]);
 const optionalRelativeRuntimeRequires = new Set(['./crypto/build/Release/sshcrypto.node']);
-const handledNativeRuntimeRequires = new Set();
 
 function isAllowedSpecifier(specifier) {
   if (builtins.has(specifier) || specifier.startsWith('node:')) return true;
   if (optionalRuntimeRequires.has(specifier)) return true;
-  if (handledNativeRuntimeRequires.has(specifier)) return true;
   return false;
 }
 

apps/kimi-code/src/cli/sub/web/run.ts

@@ -41,6 +41,7 @@ import {
   DEFAULT_SERVER_HOST,
   DEFAULT_SERVER_PORT,
   parseServerOptions,
+  serverOrigin,
   tryResolveServerToken,
   VALID_LOG_LEVELS,
   type ParsedServerOptions,
@@ -288,7 +289,7 @@ async function runServerInProcess(
   });
   logger.info('serving the REST/WS API and the bundled web UI');
   running = {
-    address: `http://${v2.host}:${v2.port}`,
+    address: serverOrigin(v2.host, v2.port),
     logger,
     close: () => v2.close(),
   };

apps/kimi-code/src/cli/sub/web/shared.ts

@@ -7,13 +7,14 @@
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 
-import type { ServerLogLevel } from '@moonshot-ai/kap-server';
+import { formatServerOrigin, type ServerLogLevel } from '@moonshot-ai/kap-server';
 
 export const LOCAL_SERVER_HOST = '127.0.0.1';
 export const DEFAULT_LAN_HOST = '0.0.0.0';
 export const DEFAULT_SERVER_HOST = LOCAL_SERVER_HOST;
 export const DEFAULT_SERVER_PORT = 58627;
-export const DEFAULT_SERVER_ORIGIN = serverOrigin(DEFAULT_SERVER_HOST, DEFAULT_SERVER_PORT);
+export const DEFAULT_SERVER_ORIGIN = formatServerOrigin(DEFAULT_SERVER_HOST, DEFAULT_SERVER_PORT);
+export { formatServerOrigin as serverOrigin };
 
 /** Filename (under KIMI_CODE_HOME) of the persistent server bearer token. */
 export const SERVER_TOKEN_FILE = 'server.token';
@@ -112,10 +113,6 @@ export function parseLogLevel(raw: string | undefined): ServerLogLevel {
   );
 }
 
-export function serverOrigin(host: string, port: number): string {
-  return `http://${host}:${port}`;
-}
-
 /** Strip `/api/v1` and trailing slashes so user-supplied origins are uniform. */
 export function normalizeServerOrigin(value: string): string {
   const url = new URL(value);

apps/kimi-code/src/native/native-require.ts

@@ -28,3 +28,13 @@ export function loadNativePackage<T>(
   if (nativeRequire === null) return null;
   return nativeRequire(packageName) as T;
 }
+
+export function loadNativePackageFile<T>(
+  packageName: string,
+  relativePath: string,
+  options: NativeAssetOptions = {},
+): T | null {
+  const packageRoot = getNativePackageRoot(packageName, options);
+  if (packageRoot === null) return null;
+  return createRequire(import.meta.url)(join(packageRoot, relativePath)) as T;
+}

apps/kimi-code/test/cli/web/web.test.ts

@@ -18,7 +18,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { registerWebCommand } from '#/cli/sub/web';
 import type { LegacyKillDeps } from '#/cli/sub/web/legacy-kill';
 import type { WebCommandDeps } from '#/cli/sub/web/run';
-import type { ParsedServerOptions } from '#/cli/sub/web/shared';
+import { serverOrigin, type ParsedServerOptions } from '#/cli/sub/web/shared';
 import { darkColors } from '#/tui/theme/colors';
 
 vi.mock('node:child_process', async (importOriginal) => {
@@ -952,6 +952,15 @@ describe('formatHostForUrl', () => {
   });
 });
 
+describe('serverOrigin', () => {
+  it('bracket-wraps an IPv6 host so the origin remains parseable', () => {
+    const origin = serverOrigin('::1', 58627);
+
+    expect(origin).toBe('http://[::1]:58627');
+    expect(new URL(origin).port).toBe('58627');
+  });
+});
+
 describe('filterDisplayAddresses', () => {
   it('drops IPv6 link-local, de-duplicates, and orders IPv4 before IPv6', async () => {
     const { filterDisplayAddresses } = await import('#/cli/sub/web/networks');

apps/kimi-code/test/native/native-assets.test.ts

@@ -12,7 +12,7 @@ import {
   type NativeAssetManifest,
   type NativeAssetSource,
 } from '#/native/native-assets';
-import { loadNativePackage } from '#/native/native-require';
+import { loadNativePackage, loadNativePackageFile } from '#/native/native-require';
 
 function sha256(bytes: Buffer | string): string {
   return createHash('sha256').update(bytes).digest('hex');
@@ -125,4 +125,30 @@ describe('native assets', () => {
       rmSync(dir, { recursive: true, force: true });
     }
   });
+
+  it('loads a package file from extracted native assets', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'kimi-native-file-require-'));
+    try {
+      const { manifest, source } = fakeManifest({
+        'node_modules/fake-native/package.json': '{}',
+        'node_modules/fake-native/prebuilds/test-target/addon.cjs':
+          "module.exports = { value: 'native' };\n",
+      });
+
+      const addon = loadNativePackageFile<{ value: string }>(
+        'fake-native',
+        join('prebuilds', 'test-target', 'addon.cjs'),
+        {
+          cacheBase: dir,
+          manifest,
+          source,
+          version: 'test',
+        },
+      );
+
+      expect(addon).toEqual({ value: 'native' });
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
 });

apps/kimi-web/src/api/daemon/client.ts

@@ -1463,8 +1463,16 @@ export class DaemonKimiWebApi implements KimiWebApi {
         handlers.onConnectionChange(connected);
       },
 
-      onError: (code: number, msg: string, fatal: boolean) => {
-        handlers.onError(code, msg, fatal);
+      onError: (code: number, msg: string, fatal: boolean, details?: unknown) => {
+        handlers.onError(code, msg, fatal, details);
+      },
+
+      onSessionListChanged: () => {
+        handlers.onSessionListChanged?.();
+      },
+
+      onSkillCatalogChanged: (sessionId: string) => {
+        handlers.onSkillCatalogChanged?.(sessionId);
       },
 
       onTerminalOutput: (sessionId, terminalId, data, seq) => {

apps/kimi-web/src/api/daemon/serverAuth.ts

@@ -18,6 +18,7 @@
 
 const STORAGE_KEY = 'kimi-web.server-credential';
 const FRAGMENT_PARAM = 'token';
+const REDIRECT_HASH_PARAM = 'redirect_hash';
 const CREDENTIAL_TTL_MS = 7 * 24 * 60 * 60 * 1000;
 
 interface StoredCredential {
@@ -38,18 +39,29 @@ function readFragmentToken(): string | undefined {
   const params = new URLSearchParams(hash.slice(1));
   const token = params.get(FRAGMENT_PARAM);
   if (!token) return undefined;
+  const redirectHash = params.get(REDIRECT_HASH_PARAM);
   // Scrub the fragment (keep path + query) so the token is not left in the
   // address bar, browser history, or any screenshot of the window.
   const url = new URL(window.location.href);
-  url.hash = '';
+  url.hash = redirectHash ?? '';
   window.history.replaceState(
     window.history.state,
     '',
-    `${url.pathname}${url.search}`,
+    `${url.pathname}${url.search}${url.hash}`,
   );
   return token;
 }
 
+export function withServerCredentialFragment(targetUrl: string, credential: string): string {
+  const url = new URL(targetUrl);
+  const redirectHash = url.hash.startsWith('#') ? url.hash.slice(1) : url.hash;
+  const params = new URLSearchParams();
+  params.set(FRAGMENT_PARAM, credential);
+  if (redirectHash !== '') params.set(REDIRECT_HASH_PARAM, redirectHash);
+  url.hash = params.toString();
+  return url.toString();
+}
+
 function createStoredCredential(credential: string): StoredCredential {
   return {
     version: 1,

apps/kimi-web/src/api/daemon/sessionOwnership.ts

@@ -0,0 +1,78 @@
+// apps/kimi-web/src/api/daemon/sessionOwnership.ts
+// Session-ownership (multi-instance) error details — local re-implementation
+// of the `details` payload carried under envelope code 40922
+// (`session.held_by_peer`). kimi-web must not depend on @moonshot-ai/agent-core
+// or @moonshot-ai/protocol, so the zod schema in
+// packages/protocol/src/session-ownership.ts is mirrored here as plain types
+// plus structural narrowing.
+//
+// Wire semantics (from the protocol schema):
+//   - creating                lease file observed mid-creation; retry shortly
+//   - routable                holder is live and registered an address; redirect
+//   - held-by-local-instance  holder has no address (local/embedded); terminal
+
+import { isDaemonApiError } from '../errors';
+
+/** Envelope `code` for `session.held_by_peer` (see kap-server error-handler). */
+export const SESSION_HELD_BY_PEER_CODE = 40922;
+
+export type SessionOwnershipPhase =
+  | 'creating'
+  | 'routable'
+  | 'held-by-local-instance';
+
+export interface HeldByPeerDetails {
+  kind: 'held-by-peer';
+  phase: SessionOwnershipPhase;
+  /** Present only when phase === 'routable'. */
+  address?: string;
+  /** Retry hint (ms) for 'creating'. */
+  retry_after_ms?: number;
+}
+
+export type SessionOwnershipDetails = HeldByPeerDetails;
+
+const PHASES: ReadonlySet<SessionOwnershipPhase> = new Set([
+  'creating',
+  'routable',
+  'held-by-local-instance',
+]);
+
+function isSessionOwnershipPhase(value: string): value is SessionOwnershipPhase {
+  return PHASES.has(value as SessionOwnershipPhase);
+}
+
+/** Structurally narrow an unknown envelope `details` payload. Returns undefined
+ *  for anything that is not a well-formed ownership payload (defensive: the
+ *  server contract is new, and a malformed payload must degrade to the generic
+ *  error toast rather than a crash). */
+export function narrowSessionOwnershipDetails(
+  details: unknown,
+): SessionOwnershipDetails | undefined {
+  if (typeof details !== 'object' || details === null) return undefined;
+  const record = details as Record<string, unknown>;
+  if (record['kind'] !== 'held-by-peer') return undefined;
+  const phase = record['phase'];
+  if (typeof phase !== 'string' || !isSessionOwnershipPhase(phase)) {
+    return undefined;
+  }
+  const address = record['address'];
+  const retryAfterMs = record['retry_after_ms'];
+  return {
+    kind: 'held-by-peer',
+    phase,
+    address: typeof address === 'string' && address.length > 0 ? address : undefined,
+    retry_after_ms:
+      typeof retryAfterMs === 'number' && Number.isFinite(retryAfterMs) && retryAfterMs >= 0
+        ? retryAfterMs
+        : undefined,
+  };
+}
+
+/** Extract the ownership details from any thrown value: a DaemonApiError with
+ *  code 40922 carrying a well-formed details payload. Anything else → undefined. */
+export function getSessionOwnershipDetails(err: unknown): SessionOwnershipDetails | undefined {
+  if (!isDaemonApiError(err)) return undefined;
+  if (err.code !== SESSION_HELD_BY_PEER_CODE) return undefined;
+  return narrowSessionOwnershipDetails(err.details);
+}

apps/kimi-web/src/api/daemon/wire.ts

@@ -583,7 +583,8 @@ export interface WireInFlightTurn {
 /** `GET /sessions/{sid}/snapshot` — atomic rebuild state at a watermark. */
 export interface WireSessionSnapshot {
   as_of_seq: number;
-  epoch: string;
+  /** Absent until the journal's first durable event: "no baseline" ≠ "baseline changed". */
+  epoch?: string;
   session: WireSession;
   messages: { items: WireMessage[]; has_more: boolean };
   in_flight_turn: WireInFlightTurn | null;