@klarkxy/dsh-git-commit 0.2.0 → 0.2.2

package/lib/contracts.d.ts

@@ -1,5 +1,16 @@
-import { RpcResult } from "@klarkxy/dsh-plugin-kit/contracts";
+import { ModelRoute, defaultModelRoute, normalizeModelRoute } from "@klarkxy/dsh-model-route";
+import { RpcResult as RpcResult$1 } from "@klarkxy/dsh-plugin-kit/contracts";
 //#region src/contracts.d.ts
+type RpcResult<T = unknown> = Extract<RpcResult$1<T>, {
+  ok: true;
+}> | {
+  ok: false;
+  error: {
+    code: string;
+    message: string;
+    partial?: PartialCommitResult;
+  };
+};
 declare const PLUGIN_NAME = "@klarkxy/dsh-git-commit";
 declare const FEATURE_ID = "git-commit";
 declare const PURPOSE_ID = "git-commit.plan";
@@ -20,12 +31,12 @@ declare const MAX_MESSAGE_CHARS = 120;
 /** git subprocess timeout. */
 declare const GIT_TIMEOUT_MS = 30000;
 declare const SETTINGS_KEY = "current";
-/** Plugin-page model selection. Empty provider/model means "follow the default". */
-interface CommitModelRoute {
-  readonly provider: string;
-  readonly model: string;
-  readonly reasoningEffort?: string;
-}
+/**
+ * Plugin-page model selection. Empty provider/model means "follow the default".
+ * The value shape, empty default, and 250/80 normalizer live in
+ * @klarkxy/dsh-model-route; this alias keeps the commit-specific name.
+ */
+type CommitModelRoute = ModelRoute;
 interface GitCommitSettings {
   readonly revision: number;
   readonly model: CommitModelRoute;
@@ -36,12 +47,9 @@ interface GitCommitSettings {
    */
   readonly allowFallback: boolean;
 }
-declare const defaultModelRoute: () => CommitModelRoute;
 declare const defaultSettings: () => GitCommitSettings;
 /** Untrusted stored flags stay opt-in: anything but a literal true is false. */
 declare function normalizeFallback(value: unknown): boolean;
-/** Untrusted stored routes collapse to the default so a bad row never breaks the run. */
-declare function normalizeModelRoute(value: unknown): CommitModelRoute;
 interface CommitModelInfo {
   readonly provider: string;
   readonly model: string;
@@ -61,6 +69,7 @@ interface GitCommitStatus {
   readonly model?: CommitModelInfo;
 }
 interface CommitGroupResult {
+  /** Empty only when a created commit's hash could not be read. */
   readonly hash: string;
   readonly message: string;
   readonly files: readonly string[];
@@ -72,6 +81,30 @@ interface CommitRunResult {
   readonly fallback: boolean;
   readonly model?: CommitModelInfo;
 }
+/**
+ * Commits that already exist when a later group fails or the run is cancelled.
+ * `commits` is the durable outcome; `failure` is why the rest did not run.
+ * A recorded commit is never rolled back and never retried by this plugin.
+ */
+interface PartialCommitResult {
+  readonly branch: string;
+  readonly commits: readonly CommitGroupResult[];
+  readonly fallback: boolean;
+  readonly model?: CommitModelInfo;
+  readonly failure: {
+    readonly code: string;
+    readonly message: string;
+  };
+  readonly remaining: readonly {
+    readonly message: string;
+    readonly files: readonly string[];
+  }[];
+  /** After a rejected commit command, unchanged HEAD could not be proved; completion and ownership are unconfirmed. */
+  readonly uncertain?: readonly {
+    readonly message: string;
+    readonly files: readonly string[];
+  }[];
+}
 //#endregion
-export { CONTRACT_VERSION, CommitGroupResult, CommitModelInfo, CommitModelRoute, CommitRunResult, DEFAULT_MAX_OUTPUT_TOKENS, FEATURE_ID, GIT_COMMIT_CLIENT_SERVICE, GIT_TIMEOUT_MS, GitCommitSettings, GitCommitStatus, MAX_MANIFEST_CHARS, MAX_MESSAGE_CHARS, MAX_UNTRACKED_PREVIEW_CHARS, PLUGIN_NAME, PROMPT_VERSION, PURPOSE_ID, RECENT_LOG_COUNT, RPC_CHANNEL, type RpcResult, SCHEMA_VERSION, SETTINGS_KEY, defaultModelRoute, defaultSettings, normalizeFallback, normalizeModelRoute };
+export { CONTRACT_VERSION, CommitGroupResult, CommitModelInfo, CommitModelRoute, CommitRunResult, DEFAULT_MAX_OUTPUT_TOKENS, FEATURE_ID, GIT_COMMIT_CLIENT_SERVICE, GIT_TIMEOUT_MS, GitCommitSettings, GitCommitStatus, MAX_MANIFEST_CHARS, MAX_MESSAGE_CHARS, MAX_UNTRACKED_PREVIEW_CHARS, PLUGIN_NAME, PROMPT_VERSION, PURPOSE_ID, PartialCommitResult, RECENT_LOG_COUNT, RPC_CHANNEL, RpcResult, SCHEMA_VERSION, SETTINGS_KEY, defaultModelRoute, defaultSettings, normalizeFallback, normalizeModelRoute };
 //# sourceMappingURL=contracts.d.ts.map

package/lib/contracts.js

@@ -1,3 +1,4 @@
+import { defaultModelRoute, normalizeModelRoute } from "@klarkxy/dsh-model-route";
 //#region src/contracts.ts
 const PLUGIN_NAME = "@klarkxy/dsh-git-commit";
 const FEATURE_ID = "git-commit";
@@ -19,10 +20,6 @@ const MAX_MESSAGE_CHARS = 120;
 /** git subprocess timeout. */
 const GIT_TIMEOUT_MS = 3e4;
 const SETTINGS_KEY = "current";
-const defaultModelRoute = () => ({
-	provider: "",
-	model: ""
-});
 const defaultSettings = () => ({
 	revision: 0,
 	model: defaultModelRoute(),
@@ -32,29 +29,6 @@ const defaultSettings = () => ({
 function normalizeFallback(value) {
 	return value === true;
 }
-function asRecord(value) {
-	return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
-}
-function asText(value) {
-	return typeof value === "string" && value.trim() ? value.trim() : void 0;
-}
-/** Untrusted stored routes collapse to the default so a bad row never breaks the run. */
-function normalizeModelRoute(value) {
-	const row = asRecord(value);
-	if (!row) return defaultModelRoute();
-	const provider = asText(row.provider) ?? "";
-	const model = asText(row.model) ?? "";
-	const effort = asText(row.reasoningEffort);
-	if (!provider || !model || provider.length > 250 || model.length > 250) return defaultModelRoute();
-	return effort && effort.length <= 80 ? {
-		provider,
-		model,
-		reasoningEffort: effort
-	} : {
-		provider,
-		model
-	};
-}
 //#endregion
 export { CONTRACT_VERSION, DEFAULT_MAX_OUTPUT_TOKENS, FEATURE_ID, GIT_COMMIT_CLIENT_SERVICE, GIT_TIMEOUT_MS, MAX_MANIFEST_CHARS, MAX_MESSAGE_CHARS, MAX_UNTRACKED_PREVIEW_CHARS, PLUGIN_NAME, PROMPT_VERSION, PURPOSE_ID, RECENT_LOG_COUNT, RPC_CHANNEL, SCHEMA_VERSION, SETTINGS_KEY, defaultModelRoute, defaultSettings, normalizeFallback, normalizeModelRoute };
 

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' 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"}
+{"version":3,"file":"contracts.js","names":[],"sources":["../src/contracts.ts"],"sourcesContent":["import { defaultModelRoute, normalizeModelRoute, type ModelRoute } from '@klarkxy/dsh-model-route'\nexport { defaultModelRoute, normalizeModelRoute }\n\n/** Browser-safe contracts. Shared RPC/result types stay on @klarkxy/dsh-plugin-kit. */\nimport type { RpcResult as SharedRpcResult } from '@klarkxy/dsh-plugin-kit/contracts'\nexport type RpcResult<T = unknown> = Extract<SharedRpcResult<T>, { ok: true }> | {\n  ok: false\n  error: { code: string; message: string; partial?: PartialCommitResult }\n}\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/**\n * Plugin-page model selection. Empty provider/model means \"follow the default\".\n * The value shape, empty default, and 250/80 normalizer live in\n * @klarkxy/dsh-model-route; this alias keeps the commit-specific name.\n */\nexport type CommitModelRoute = ModelRoute\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 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\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  /** Empty only when a created commit's hash could not be read. */\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\n/**\n * Commits that already exist when a later group fails or the run is cancelled.\n * `commits` is the durable outcome; `failure` is why the rest did not run.\n * A recorded commit is never rolled back and never retried by this plugin.\n */\nexport interface PartialCommitResult {\n  readonly branch: string\n  readonly commits: readonly CommitGroupResult[]\n  readonly fallback: boolean\n  readonly model?: CommitModelInfo\n  readonly failure: { readonly code: string; readonly message: string }\n  readonly remaining: readonly { readonly message: string; readonly files: readonly string[] }[]\n  /** After a rejected commit command, unchanged HEAD could not be proved; completion and ownership are unconfirmed. */\n  readonly uncertain?: readonly { readonly message: string; readonly files: readonly string[] }[]\n}\n"],"mappings":";;AAUA,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,yBAA4C;CACvD,UAAU;CAAG,OAAO,kBAAkB;CAAG,eAAe;AAC1D;;AAGA,SAAgB,kBAAkB,OAAyB;CACzD,OAAO,UAAU;AACnB"}

package/lib/index.d.ts

@@ -1,6 +1,5 @@
-import { CommitRunResult, GitCommitSettings, GitCommitStatus, defaultSettings, normalizeFallback, normalizeModelRoute } from "./contracts.js";
+import { CommitRunResult, GitCommitSettings, GitCommitStatus, RpcResult, defaultSettings, normalizeFallback, normalizeModelRoute } from "./contracts.js";
 import { LlmTextCaller } from "@klarkxy/dsh-plugin-kit";
-import { RpcResult } from "@klarkxy/dsh-plugin-kit/contracts";
 import { Context } from "@deepseek-ai/cordis";
 //#region src/git.d.ts
 interface GitRunOptions {
@@ -46,6 +45,7 @@ interface AgentStoreLike {
 }
 interface GitCommitServiceDeps {
   readonly plugin: string;
+  readonly onSettingsChanged?: (revision: number) => void;
   readonly llm: LlmTextCaller;
   readonly host?: unknown;
   readonly sessions: SessionStoreLike;
@@ -69,19 +69,23 @@ declare class GitCommitService {
   private settingsFailure;
   private settingsAdopted;
   private disposed;
+  /** Aborted on unload so an in-flight model plan receives the same signal as a cancelled request. */
+  private readonly lifetime;
   constructor(deps: GitCommitServiceDeps);
   /** 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>;
+  /** Request cancellation and plugin unload share one signal. A disposed service rejects before any new work. */
+  private workSignal;
   private waitForSettings;
   private selectedModel;
   updateSettings(patch: Omit<GitCommitSettings, 'revision'>, expectedRevision: number): Promise<GitCommitSettings>;
   start(): void;
   dispose(): Promise<void>;
   private resolveRepo;
-  status(sessionId: string): Promise<GitCommitStatus>;
+  status(sessionId: string, signal?: AbortSignal): Promise<GitCommitStatus>;
   commit(sessionId: string, signal?: AbortSignal): Promise<CommitRunResult>;
   private runCommit;
 }