@klarkxy/dsh-git-commit 0.1.5 → 0.2.0

package/lib/client.js

@@ -1,168 +1,7 @@
-function __createDshNodeShims() {
-  class EventEmitter {
-    constructor() {
-      this._e = Object.create(null)
-    }
-    on(type, fn) {
-      (this._e[type] ||= []).push(fn)
-      return this
-    }
-    addListener(type, fn) {
-      return this.on(type, fn)
-    }
-    once(type, fn) {
-      const wrap = (...args) => {
-        this.off(type, wrap)
-        fn(...args)
-      }
-      return this.on(type, wrap)
-    }
-    off(type, fn) {
-      const list = this._e[type]
-      if (list) this._e[type] = list.filter((item) => item !== fn)
-      return this
-    }
-    removeListener(type, fn) {
-      return this.off(type, fn)
-    }
-    emit(type, ...args) {
-      const list = this._e[type]
-      if (!list) return false
-      for (const fn of list.slice()) fn(...args)
-      return true
-    }
-    removeAllListeners(type) {
-      if (type) delete this._e[type]
-      else this._e = Object.create(null)
-      return this
-    }
-    listeners(type) {
-      return (this._e[type] || []).slice()
-    }
-    setMaxListeners() {
-      return this
-    }
-  }
-
-  class Buffer extends Uint8Array {
-    static from(value, encodingOrOffset, length) {
-      if (typeof value === 'string') return new Buffer(new TextEncoder().encode(value))
-      if (value instanceof ArrayBuffer) return new Buffer(new Uint8Array(value, encodingOrOffset, length))
-      if (ArrayBuffer.isView(value)) return new Buffer(new Uint8Array(value.buffer, value.byteOffset, value.byteLength))
-      if (Array.isArray(value) || value && typeof value.length === 'number') return new Buffer(Uint8Array.from(value))
-      return new Buffer(0)
-    }
-    static alloc(size, fill) {
-      const buf = new Buffer(size)
-      if (fill !== undefined && fill !== 0) {
-        if (typeof fill === 'string') {
-          const bytes = new TextEncoder().encode(fill)
-          for (let i = 0; i < size; i += 1) buf[i] = bytes[i % bytes.length]
-        } else buf.fill(fill)
-      }
-      return buf
-    }
-    static allocUnsafe(size) {
-      return new Buffer(size)
-    }
-    static allocUnsafeSlow(size) {
-      return new Buffer(size)
-    }
-    static concat(list, totalLength) {
-      const length = totalLength ?? list.reduce((sum, item) => sum + item.length, 0)
-      const out = new Buffer(length)
-      let offset = 0
-      for (const item of list) {
-        out.set(item, offset)
-        offset += item.length
-      }
-      return out
-    }
-    static isBuffer(value) {
-      return value instanceof Buffer
-    }
-    static byteLength(value) {
-      if (typeof value === 'string') return new TextEncoder().encode(value).length
-      return value?.byteLength ?? value?.length ?? 0
-    }
-    static isEncoding(encoding) {
-      return /^(utf8|utf-8|ascii|latin1|binary|hex|base64|base64url)$/i.test(String(encoding || ''))
-    }
-    toString(encoding) {
-      if (encoding === 'hex') return [...this].map((byte) => byte.toString(16).padStart(2, '0')).join('')
-      if (encoding === 'base64') {
-        let binary = ''
-        this.forEach((byte) => {
-          binary += String.fromCharCode(byte)
-        })
-        return btoa(binary)
-      }
-      return new TextDecoder().decode(this)
-    }
-    slice(start, end) {
-      return Buffer.from(super.subarray(start, end))
-    }
-    copy(target, targetStart = 0, start = 0, end = this.length) {
-      const sliced = this.subarray(start, end)
-      target.set(sliced, targetStart)
-      return sliced.length
-    }
-    write(string, offset = 0) {
-      const bytes = new TextEncoder().encode(string)
-      const written = Math.min(bytes.length, this.length - offset)
-      this.set(bytes.subarray(0, written), offset)
-      return written
-    }
-  }
-
-  function inherits(ctor, superCtor) {
-    ctor.super_ = superCtor
-    ctor.prototype = Object.create(superCtor.prototype, {
-      constructor: { value: ctor, writable: true, configurable: true },
-    })
-  }
-
-  if (!globalThis.Buffer) globalThis.Buffer = Buffer
-
-  return {
-    buffer: { Buffer, SlowBuffer: Buffer, INSPECT_MAX_BYTES: 50, kMaxLength: 0x7fffffff },
-    stream: {
-      Stream: EventEmitter,
-      Readable: EventEmitter,
-      Writable: EventEmitter,
-      Duplex: EventEmitter,
-      Transform: EventEmitter,
-      PassThrough: EventEmitter,
-    },
-    events: { EventEmitter },
-    util: {
-      deprecate(fn) {
-        return fn
-      },
-      inherits,
-      inspect() {
-        return ''
-      },
-      format(value) {
-        return String(value)
-      },
-      types: { isBuffer: Buffer.isBuffer },
-    },
-  }
-}
-
 window.__ModuleLoader__.load({
   id: "@klarkxy/dsh-git-commit",
   factory: (dshRequire) => {
-    var __nodeShims;
-    var process = globalThis.process || { env: {}, nextTick: function (fn) { var args = [].slice.call(arguments, 1); queueMicrotask(function () { fn.apply(null, args); }); } };
-    var require = function (id) {
-      if (id === 'buffer' || id === 'stream' || id === 'util' || id === 'events') {
-        if (!__nodeShims) __nodeShims = __createDshNodeShims();
-        return __nodeShims[id];
-      }
-      return dshRequire(id);
-    };
+    var require = dshRequire;
     var module = { exports: {} };
     var exports = module.exports;
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
@@ -170,21 +9,14 @@ let react = require("react");
 let react_dom = require("react-dom");
 let _deepseek_ai_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
 let react_jsx_runtime = require("react/jsx-runtime");
-//#region ../dsh-plugin-kit/src/model-menu.ts
-/**
-* Shared plugin-page model menu.
-*
-* A feature plugin's own settings row exposes a model select. An empty
-* selection means the host default chat model for that feature's own call.
-*
-* Browser-safe and React-optional: pure helpers live here so hosts and clients
-* share one catalog contract without bundling React into the host build.
-*/
+//#region ../dsh-model-route/src/route.ts
 const KEY_SEPARATOR = "";
-function modelMenuChoiceKey(provider, model) {
+/** Stable key for one route, safe to use as a select-option value. */
+function modelRouteKey(provider, model) {
 	return provider && model ? `${provider}${KEY_SEPARATOR}${model}` : "";
 }
-function parseModelMenuChoiceKey(value) {
+/** Inverse of modelRouteKey; undefined for malformed keys. */
+function parseModelRouteKey(value) {
 	const index = value.indexOf(KEY_SEPARATOR);
 	if (index <= 0) return void 0;
 	const provider = value.slice(0, index);
@@ -195,6 +27,8 @@ function parseModelMenuChoiceKey(value) {
 		model
 	};
 }
+//#endregion
+//#region ../dsh-model-route/src/catalog.ts
 function asRecord(value) {
 	return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 }
@@ -1216,7 +1050,7 @@ function GitCommitSettingsPanel(props) {
 					children: text.model
 				}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
 					className: "dsh-ui-select",
-					value: modelMenuChoiceKey(current.provider, current.model),
+					value: modelRouteKey(current.provider, current.model),
 					disabled: busy,
 					onChange: (event) => {
 						const key = event.target.value;
@@ -1227,16 +1061,16 @@ function GitCommitSettingsPanel(props) {
 							} });
 							return;
 						}
-						const parsed = parseModelMenuChoiceKey(key);
+						const parsed = parseModelRouteKey(key);
 						if (parsed) save({ model: parsed });
 					},
 					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
 						value: "",
 						children: text.modelDefault
 					}), choices.map((choice) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
-						value: modelMenuChoiceKey(choice.provider, choice.model),
+						value: modelRouteKey(choice.provider, choice.model),
 						children: choice.label
-					}, modelMenuChoiceKey(choice.provider, choice.model)))]
+					}, modelRouteKey(choice.provider, choice.model)))]
 				})]
 			}),
 			selected && efforts.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {

package/lib/contracts.d.ts

@@ -45,7 +45,7 @@ declare function normalizeModelRoute(value: unknown): CommitModelRoute;
 interface CommitModelInfo {
   readonly provider: string;
   readonly model: string;
-  /** 'page' is the plugin-page selection; 'default' is the host chat model. */
+  /** 'page' is the plugin-page selection; 'default' follows the session or host chat model. */
   readonly source: 'page' | 'default';
 }
 interface GitCommitStatus {

package/lib/contracts.js.map

@@ -1 +1 @@
-{"version":3,"file":"contracts.js","names":[],"sources":["../src/contracts.ts"],"sourcesContent":["/** Browser-safe contracts. Shared RPC/result types stay on @klarkxy/dsh-plugin-kit. */\nexport type { RpcResult } from '@klarkxy/dsh-plugin-kit/contracts'\n\nexport const PLUGIN_NAME = '@klarkxy/dsh-git-commit'\nexport const FEATURE_ID = 'git-commit'\nexport const PURPOSE_ID = 'git-commit.plan'\nexport const RPC_CHANNEL = '/dsh-git-commit'\nexport const GIT_COMMIT_CLIENT_SERVICE = 'dshGitCommitClient'\nexport const PROMPT_VERSION = 'git-commit.v1'\nexport const SCHEMA_VERSION = 'commit-plan-json.v1'\nexport const CONTRACT_VERSION = 1\n\nexport const DEFAULT_MAX_OUTPUT_TOKENS = 2048\n/** Total character budget for the change manifest sent to the model. */\nexport const MAX_MANIFEST_CHARS = 48_000\n/** Per-file preview cap for untracked files. */\nexport const MAX_UNTRACKED_PREVIEW_CHARS = 2_000\n/** Recent commit subjects supplied as style reference. */\nexport const RECENT_LOG_COUNT = 10\n/** Hard cap for one generated commit message line. */\nexport const MAX_MESSAGE_CHARS = 120\n/** git subprocess timeout. */\nexport const GIT_TIMEOUT_MS = 30_000\nexport const SETTINGS_KEY = 'current'\n\n/** Plugin-page model selection. Empty provider/model means \"follow the default\". */\nexport interface CommitModelRoute {\n  readonly provider: string\n  readonly model: string\n  readonly reasoningEffort?: string\n}\n\nexport interface GitCommitSettings {\n  readonly revision: number\n  readonly model: CommitModelRoute\n  /**\n   * Opt-in single commit when the model produced no usable plan. Off by\n   * default: an unplanned commit is one the user never reviewed, so a failed\n   * or unusable model call rejects the run instead of writing to the index.\n   */\n  readonly allowFallback: boolean\n}\n\nexport const defaultModelRoute = (): CommitModelRoute => ({ provider: '', model: '' })\n\nexport const defaultSettings = (): GitCommitSettings => ({\n  revision: 0, model: defaultModelRoute(), allowFallback: false,\n})\n\n/** Untrusted stored flags stay opt-in: anything but a literal true is false. */\nexport function normalizeFallback(value: unknown): boolean {\n  return value === true\n}\n\nfunction asRecord(value: unknown): Record<string, unknown> | undefined {\n  return value && typeof value === 'object' && !Array.isArray(value) ? value as Record<string, unknown> : undefined\n}\n\nfunction asText(value: unknown): string | undefined {\n  return typeof value === 'string' && value.trim() ? value.trim() : undefined\n}\n\n/** Untrusted stored routes collapse to the default so a bad row never breaks the run. */\nexport function normalizeModelRoute(value: unknown): CommitModelRoute {\n  const row = asRecord(value)\n  if (!row) return defaultModelRoute()\n  const provider = asText(row.provider) ?? ''\n  const model = asText(row.model) ?? ''\n  const effort = asText(row.reasoningEffort)\n  if (!provider || !model || provider.length > 250 || model.length > 250) return defaultModelRoute()\n  return effort && effort.length <= 80 ? { provider, model, reasoningEffort: effort } : { provider, model }\n}\n\nexport interface CommitModelInfo {\n  readonly provider: string\n  readonly model: string\n  /** 'page' is the plugin-page selection; 'default' is the host chat model. */\n  readonly source: 'page' | 'default'\n}\n\nexport interface GitCommitStatus {\n  readonly available: boolean\n  /** Machine-readable reason when unavailable: 'no-session' | 'no-cwd' | 'not-a-repo' | 'no-git'. */\n  readonly reason?: string\n  readonly detail?: string\n  readonly root?: string\n  readonly branch?: string\n  readonly workspace: { readonly files: number }\n  readonly model?: CommitModelInfo\n}\n\nexport interface CommitGroupResult {\n  readonly hash: string\n  readonly message: string\n  readonly files: readonly string[]\n}\n\nexport interface CommitRunResult {\n  readonly branch: string\n  readonly commits: readonly CommitGroupResult[]\n  /** True when the model plan was unavailable and a single fallback commit was used. */\n  readonly fallback: boolean\n  readonly model?: CommitModelInfo\n}\n"],"mappings":";AAGA,MAAa,cAAc;AAC3B,MAAa,aAAa;AAC1B,MAAa,aAAa;AAC1B,MAAa,cAAc;AAC3B,MAAa,4BAA4B;AACzC,MAAa,iBAAiB;AAC9B,MAAa,iBAAiB;AAC9B,MAAa,mBAAmB;AAEhC,MAAa,4BAA4B;;AAEzC,MAAa,qBAAqB;;AAElC,MAAa,8BAA8B;;AAE3C,MAAa,mBAAmB;;AAEhC,MAAa,oBAAoB;;AAEjC,MAAa,iBAAiB;AAC9B,MAAa,eAAe;AAoB5B,MAAa,2BAA6C;CAAE,UAAU;CAAI,OAAO;AAAG;AAEpF,MAAa,yBAA4C;CACvD,UAAU;CAAG,OAAO,kBAAkB;CAAG,eAAe;AAC1D;;AAGA,SAAgB,kBAAkB,OAAyB;CACzD,OAAO,UAAU;AACnB;AAEA,SAAS,SAAS,OAAqD;CACrE,OAAO,SAAS,OAAO,UAAU,YAAY,CAAC,MAAM,QAAQ,KAAK,IAAI,QAAmC,KAAA;AAC1G;AAEA,SAAS,OAAO,OAAoC;CAClD,OAAO,OAAO,UAAU,YAAY,MAAM,KAAK,IAAI,MAAM,KAAK,IAAI,KAAA;AACpE;;AAGA,SAAgB,oBAAoB,OAAkC;CACpE,MAAM,MAAM,SAAS,KAAK;CAC1B,IAAI,CAAC,KAAK,OAAO,kBAAkB;CACnC,MAAM,WAAW,OAAO,IAAI,QAAQ,KAAK;CACzC,MAAM,QAAQ,OAAO,IAAI,KAAK,KAAK;CACnC,MAAM,SAAS,OAAO,IAAI,eAAe;CACzC,IAAI,CAAC,YAAY,CAAC,SAAS,SAAS,SAAS,OAAO,MAAM,SAAS,KAAK,OAAO,kBAAkB;CACjG,OAAO,UAAU,OAAO,UAAU,KAAK;EAAE;EAAU;EAAO,iBAAiB;CAAO,IAAI;EAAE;EAAU;CAAM;AAC1G"}
+{"version":3,"file":"contracts.js","names":[],"sources":["../src/contracts.ts"],"sourcesContent":["/** Browser-safe contracts. Shared RPC/result types stay on @klarkxy/dsh-plugin-kit. */\nexport type { RpcResult } from '@klarkxy/dsh-plugin-kit/contracts'\n\nexport const PLUGIN_NAME = '@klarkxy/dsh-git-commit'\nexport const FEATURE_ID = 'git-commit'\nexport const PURPOSE_ID = 'git-commit.plan'\nexport const RPC_CHANNEL = '/dsh-git-commit'\nexport const GIT_COMMIT_CLIENT_SERVICE = 'dshGitCommitClient'\nexport const PROMPT_VERSION = 'git-commit.v1'\nexport const SCHEMA_VERSION = 'commit-plan-json.v1'\nexport const CONTRACT_VERSION = 1\n\nexport const DEFAULT_MAX_OUTPUT_TOKENS = 2048\n/** Total character budget for the change manifest sent to the model. */\nexport const MAX_MANIFEST_CHARS = 48_000\n/** Per-file preview cap for untracked files. */\nexport const MAX_UNTRACKED_PREVIEW_CHARS = 2_000\n/** Recent commit subjects supplied as style reference. */\nexport const RECENT_LOG_COUNT = 10\n/** Hard cap for one generated commit message line. */\nexport const MAX_MESSAGE_CHARS = 120\n/** git subprocess timeout. */\nexport const GIT_TIMEOUT_MS = 30_000\nexport const SETTINGS_KEY = 'current'\n\n/** Plugin-page model selection. Empty provider/model means \"follow the default\". */\nexport interface CommitModelRoute {\n  readonly provider: string\n  readonly model: string\n  readonly reasoningEffort?: string\n}\n\nexport interface GitCommitSettings {\n  readonly revision: number\n  readonly model: CommitModelRoute\n  /**\n   * Opt-in single commit when the model produced no usable plan. Off by\n   * default: an unplanned commit is one the user never reviewed, so a failed\n   * or unusable model call rejects the run instead of writing to the index.\n   */\n  readonly allowFallback: boolean\n}\n\nexport const defaultModelRoute = (): CommitModelRoute => ({ provider: '', model: '' })\n\nexport const defaultSettings = (): GitCommitSettings => ({\n  revision: 0, model: defaultModelRoute(), allowFallback: false,\n})\n\n/** Untrusted stored flags stay opt-in: anything but a literal true is false. */\nexport function normalizeFallback(value: unknown): boolean {\n  return value === true\n}\n\nfunction asRecord(value: unknown): Record<string, unknown> | undefined {\n  return value && typeof value === 'object' && !Array.isArray(value) ? value as Record<string, unknown> : undefined\n}\n\nfunction asText(value: unknown): string | undefined {\n  return typeof value === 'string' && value.trim() ? value.trim() : undefined\n}\n\n/** Untrusted stored routes collapse to the default so a bad row never breaks the run. */\nexport function normalizeModelRoute(value: unknown): CommitModelRoute {\n  const row = asRecord(value)\n  if (!row) return defaultModelRoute()\n  const provider = asText(row.provider) ?? ''\n  const model = asText(row.model) ?? ''\n  const effort = asText(row.reasoningEffort)\n  if (!provider || !model || provider.length > 250 || model.length > 250) return defaultModelRoute()\n  return effort && effort.length <= 80 ? { provider, model, reasoningEffort: effort } : { provider, model }\n}\n\nexport interface CommitModelInfo {\n  readonly provider: string\n  readonly model: string\n  /** 'page' is the plugin-page selection; 'default' follows the session or host chat model. */\n  readonly source: 'page' | 'default'\n}\n\nexport interface GitCommitStatus {\n  readonly available: boolean\n  /** Machine-readable reason when unavailable: 'no-session' | 'no-cwd' | 'not-a-repo' | 'no-git'. */\n  readonly reason?: string\n  readonly detail?: string\n  readonly root?: string\n  readonly branch?: string\n  readonly workspace: { readonly files: number }\n  readonly model?: CommitModelInfo\n}\n\nexport interface CommitGroupResult {\n  readonly hash: string\n  readonly message: string\n  readonly files: readonly string[]\n}\n\nexport interface CommitRunResult {\n  readonly branch: string\n  readonly commits: readonly CommitGroupResult[]\n  /** True when the model plan was unavailable and a single fallback commit was used. */\n  readonly fallback: boolean\n  readonly model?: CommitModelInfo\n}\n"],"mappings":";AAGA,MAAa,cAAc;AAC3B,MAAa,aAAa;AAC1B,MAAa,aAAa;AAC1B,MAAa,cAAc;AAC3B,MAAa,4BAA4B;AACzC,MAAa,iBAAiB;AAC9B,MAAa,iBAAiB;AAC9B,MAAa,mBAAmB;AAEhC,MAAa,4BAA4B;;AAEzC,MAAa,qBAAqB;;AAElC,MAAa,8BAA8B;;AAE3C,MAAa,mBAAmB;;AAEhC,MAAa,oBAAoB;;AAEjC,MAAa,iBAAiB;AAC9B,MAAa,eAAe;AAoB5B,MAAa,2BAA6C;CAAE,UAAU;CAAI,OAAO;AAAG;AAEpF,MAAa,yBAA4C;CACvD,UAAU;CAAG,OAAO,kBAAkB;CAAG,eAAe;AAC1D;;AAGA,SAAgB,kBAAkB,OAAyB;CACzD,OAAO,UAAU;AACnB;AAEA,SAAS,SAAS,OAAqD;CACrE,OAAO,SAAS,OAAO,UAAU,YAAY,CAAC,MAAM,QAAQ,KAAK,IAAI,QAAmC,KAAA;AAC1G;AAEA,SAAS,OAAO,OAAoC;CAClD,OAAO,OAAO,UAAU,YAAY,MAAM,KAAK,IAAI,MAAM,KAAK,IAAI,KAAA;AACpE;;AAGA,SAAgB,oBAAoB,OAAkC;CACpE,MAAM,MAAM,SAAS,KAAK;CAC1B,IAAI,CAAC,KAAK,OAAO,kBAAkB;CACnC,MAAM,WAAW,OAAO,IAAI,QAAQ,KAAK;CACzC,MAAM,QAAQ,OAAO,IAAI,KAAK,KAAK;CACnC,MAAM,SAAS,OAAO,IAAI,eAAe;CACzC,IAAI,CAAC,YAAY,CAAC,SAAS,SAAS,SAAS,OAAO,MAAM,SAAS,KAAK,OAAO,kBAAkB;CACjG,OAAO,UAAU,OAAO,UAAU,KAAK;EAAE;EAAU;EAAO,iBAAiB;CAAO,IAAI;EAAE;EAAU;CAAM;AAC1G"}

package/lib/index.d.ts

@@ -66,11 +66,16 @@ declare class GitCommitService {
   private settings;
   private settingsPending;
   private readonly settingsReady;
+  private settingsFailure;
+  private settingsAdopted;
   private disposed;
   constructor(deps: GitCommitServiceDeps);
-  /** Apply a freshly loaded settings row; the default stays until a row is read. */
+  /** A refreshed row wins over a pending initial read. */
   adoptSettings(next: GitCommitSettings): void;
+  /** Existing synchronous snapshot API; host operations wait for initialization first. */
   getSettings(): GitCommitSettings;
+  ready(): Promise<void>;
+  private waitForSettings;
   private selectedModel;
   updateSettings(patch: Omit<GitCommitSettings, 'revision'>, expectedRevision: number): Promise<GitCommitSettings>;
   start(): void;
@@ -102,7 +107,7 @@ declare function parsePlan(text: string, files: readonly ChangedFile[]): PlanGro
 //#endregion
 //#region src/index.d.ts
 declare const name = "@klarkxy/dsh-git-commit";
-declare const inject: readonly ["llm", "sessions", "agents", "storageDomain", "connection", "webServer"];
+declare const inject: readonly ["llm", "sessions", "agents", "storageDomain", "connection", "webServer", "sessionProjections", "agentDefaultModel"];
 declare module '@deepseek-ai/cordis' {
   interface Context {
     gitCommit: GitCommitService;

package/lib/index.js

@@ -1,7 +1,7 @@
 import { DEFAULT_MAX_OUTPUT_TOKENS, MAX_MANIFEST_CHARS, MAX_UNTRACKED_PREVIEW_CHARS, PLUGIN_NAME, RPC_CHANNEL, SETTINGS_KEY, defaultSettings, normalizeFallback, normalizeModelRoute } from "./contracts.js";
 import { registerHostRpc } from "@klarkxy/dsh-plugin-kit/host-rpc";
 import { callLlmText, resolveFeatureModel } from "@klarkxy/dsh-plugin-kit";
-import { modelMenuOverride } from "@klarkxy/dsh-plugin-kit/model-menu";
+import { modelRouteOverride } from "@klarkxy/dsh-model-route";
 import { execFile } from "node:child_process";
 import { createHash } from "node:crypto";
 import { constants } from "node:fs";
@@ -594,6 +594,8 @@ var GitCommitService = class {
 	settings;
 	settingsPending = Promise.resolve();
 	settingsReady;
+	settingsFailure;
+	settingsAdopted = false;
 	disposed = false;
 	constructor(deps) {
 		this.deps = deps;
@@ -601,29 +603,64 @@ var GitCommitService = class {
 		this.preview = deps.preview ?? untrackedPreview;
 		this.settings = defaultSettings();
 		this.settingsReady = deps.settings?.load().then((loaded) => {
-			if (loaded) this.settings = structuredClone(loaded);
+			if (loaded && !this.settingsAdopted) this.settings = structuredClone(loaded);
 		}, () => {
-			this.settings = defaultSettings();
+			if (!this.settingsAdopted) this.settingsFailure = new CommitRunError("settings-unavailable", "dsh-git-commit: saved settings could not be read; reload the plugin before retrying");
 		}) ?? Promise.resolve();
 	}
-	/** Apply a freshly loaded settings row; the default stays until a row is read. */
+	/** A refreshed row wins over a pending initial read. */
 	adoptSettings(next) {
+		if (this.disposed) throw new CommitRunError("disposed", "dsh-git-commit: plugin disabled");
+		this.settingsAdopted = true;
+		this.settingsFailure = void 0;
 		this.settings = structuredClone(next);
 	}
+	/** Existing synchronous snapshot API; host operations wait for initialization first. */
 	getSettings() {
+		if (this.settingsFailure) throw this.settingsFailure;
 		return structuredClone(this.settings);
 	}
-	selectedModel() {
-		const page = modelMenuOverride(this.settings.model);
+	async ready() {
+		await this.settingsReady;
+		if (this.settingsFailure) throw this.settingsFailure;
+	}
+	async waitForSettings(signal) {
+		signal?.throwIfAborted();
+		if (!signal) {
+			await this.ready();
+			return;
+		}
+		let onAbort = () => {};
+		const aborted = new Promise((_, reject) => {
+			onAbort = () => {
+				try {
+					signal.throwIfAborted();
+				} catch (error) {
+					reject(error);
+				}
+			};
+			signal.addEventListener("abort", onAbort, { once: true });
+			if (signal.aborted) onAbort();
+		});
+		try {
+			await Promise.race([this.settingsReady, aborted]);
+		} finally {
+			signal.removeEventListener("abort", onAbort);
+		}
+		signal.throwIfAborted();
+		if (this.settingsFailure) throw this.settingsFailure;
+	}
+	selectedModel(sessionId) {
+		const page = modelRouteOverride(this.settings.model);
 		return {
-			route: resolveFeatureModel(this.deps.host, page),
+			route: resolveFeatureModel(this.deps.host, page, sessionId),
 			source: page ? "page" : "default"
 		};
 	}
 	async updateSettings(patch, expectedRevision) {
 		const detached = structuredClone(patch);
 		const result = this.settingsPending.then(async () => {
-			await this.settingsReady;
+			await this.ready();
 			if (this.disposed) throw new CommitRunError("disposed", "dsh-git-commit: plugin disabled");
 			if (expectedRevision !== this.settings.revision) throw new CommitRunError("stale", "dsh-git-commit: settings changed; reload and retry");
 			const next = {
@@ -641,6 +678,7 @@ var GitCommitService = class {
 	start() {}
 	async dispose() {
 		this.disposed = true;
+		await this.settingsReady;
 		await this.settingsPending;
 		await this.running?.catch(() => {});
 	}
@@ -657,6 +695,7 @@ var GitCommitService = class {
 		}
 	}
 	async status(sessionId) {
+		await this.ready();
 		let resolved;
 		try {
 			resolved = await this.resolveRepo(sessionId);
@@ -670,7 +709,7 @@ var GitCommitService = class {
 			throw error;
 		}
 		const changes = await workingTreeChanges(this.run, resolved.root);
-		const selected = this.selectedModel();
+		const selected = this.selectedModel(sessionId);
 		const model = modelInfo(selected.route, selected.source);
 		return {
 			available: true,
@@ -691,6 +730,8 @@ var GitCommitService = class {
 		}
 	}
 	async runCommit(sessionId, signal) {
+		await this.waitForSettings(signal);
+		if (this.disposed) throw new CommitRunError("cancelled", "dsh-git-commit: plugin is no longer active");
 		const session = this.deps.sessions.get(sessionId);
 		const sessionCwd = normalizeCwd(session?.header?.cwd);
 		const resolved = await this.resolveRepo(sessionId);
@@ -721,7 +762,7 @@ var GitCommitService = class {
 		let groups;
 		let planFailure = "no model route was available";
 		let model;
-		const planned = this.selectedModel();
+		const planned = this.selectedModel(sessionId);
 		if (planned.route) try {
 			const result = await callLlmText(this.deps.llm, {
 				plugin: this.deps.plugin,
@@ -825,7 +866,9 @@ const inject = [
 	"agents",
 	"storageDomain",
 	"connection",
-	"webServer"
+	"webServer",
+	"sessionProjections",
+	"agentDefaultModel"
 ];
 function stringField(payload, key) {
 	if (!payload || typeof payload !== "object") return void 0;
@@ -865,10 +908,12 @@ async function handleRpc(service, endpoint, payload, signal) {
 					value: await service.status(sessionId)
 				};
 			}
-			case "settings": return {
-				ok: true,
-				value: service.getSettings()
-			};
+			case "settings":
+				await service.ready();
+				return {
+					ok: true,
+					value: service.getSettings()
+				};
 			case "settings.update": {
 				const parsed = updateSettingsSchema.safeParse(payload);
 				if (!parsed.success) return {