@ibobbyts/dsh-git-commit 0.2.0 → 0.2.1

package/README.md

@@ -4,7 +4,7 @@ A lightweight floating **Git status + AI Commit** plugin for [DeepSeek Harness (
 
 - View the current Session's Git branch and changed-line counts in a draggable, collapsible panel.
 - Generate a commit message through a model configured in DSH, then make **one real Git commit**.
-- Choose global/repository instructions, a model, optional Token metrics, and countdown color in the native DSH right sidebar.
+- Configure independent **Repository** / **Global** settings tabs: per-repository model overrides (default: inherit global), writing instructions, Token metrics, and countdown color in the native DSH right sidebar.
 - Keep the floating panel within the visible window; **drag locations persist** across restarts. The settings panel includes **Reset floating window position**.
 - Non-Git directories show a compact warning or remain hidden according to your preference.
 

package/lib/client.js

@@ -1,6 +1,6 @@
 /** Browser loader bundle (no JSX compilation required). DSH also loads this in Desktop. */
 window.__ModuleLoader__.load({
-  id: 'dsh-git-commit',
+  id: '@ibobbyts/dsh-git-commit',
   factory: (require) => {
     const React = require('react');
     const h = React.createElement;
@@ -53,6 +53,12 @@ window.__ModuleLoader__.load({
       .dgc-settings-divider{width:100%;border:0;border-top:1px solid var(--dsw-alias-border-l2);margin:2px 0}
       .dgc-repo-path{display:block;font:11px ui-monospace,Menlo,monospace;color:var(--dsw-alias-label-secondary);overflow-wrap:anywhere;word-break:break-all}
       .dgc-save-error{color:var(--dsw-alias-state-error-primary)}
+      .dgc-tabs{display:flex;gap:4px;padding:3px;background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l1);border-radius:8px}
+      .dgc-tab{flex:1;min-width:0;padding:8px 10px;border-radius:6px;border:1px solid transparent;background:transparent;color:var(--dsw-alias-label-secondary);font-size:12px;font-weight:600;line-height:1.25;font-family:inherit;cursor:pointer}
+      .dgc-tab[aria-selected="true"]{background:var(--dsw-alias-bg-overlay);border-color:var(--dsw-alias-border-l1);color:var(--dsw-alias-label-primary)}
+      .dgc-tab:focus-visible{outline:2px solid var(--dsw-alias-brand-primary);outline-offset:1px}
+      .dgc-tab-panel{display:flex;flex-direction:column;gap:13px;min-width:0}
+      body[data-ds-dark-theme] .dgc-tab[aria-selected="true"]{background:#383e47;border-color:#596271;color:#f3f5f8}
       .dgc-reset-position{display:inline-flex;align-items:center;justify-content:center;gap:8px;min-height:34px;width:100%;font:inherit;cursor:pointer;border-radius:7px;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-1);color:var(--dsw-alias-label-primary)}
       .dgc-reset-position:hover{background:var(--dsw-alias-bg-layer-2)}
       .dgc-reset-position:focus-visible{outline:2px solid var(--dsw-alias-brand-primary);outline-offset:2px}
@@ -443,6 +449,7 @@ window.__ModuleLoader__.load({
       function CommitSettings() {
         const cwd = React.useSyncExternalStore(workspace.subscribe, workspace.getSnapshot, workspace.getSnapshot);
         const [form, setForm] = React.useState(null);
+        const [activeTab, setActiveTab] = React.useState('repository');
         const [models, setModels] = React.useState([]);
         const [defaultModel, setDefaultModel] = React.useState(null);
         const [loadError, setLoadError] = React.useState('');
@@ -459,6 +466,10 @@ window.__ModuleLoader__.load({
           },error=>{if(active)setLoadError(error.message);});
           return ()=>{active=false;};
         },[cwd]);
+        React.useEffect(()=>{
+          // A repository-less workspace still permits editing global preferences.
+          if (form?.isRepository === false) setActiveTab('global');
+        },[form?.isRepository]);
         React.useEffect(()=>{
           let active = true;
           const saver = createAutoSaver(patch=>rpc('saveSettings',{cwd,patch}),error=>{
@@ -479,55 +490,109 @@ window.__ModuleLoader__.load({
           setSaveError('');
           saverRef.current?.update(key,value,immediate);
         };
-        const choice=form?.model?`${form.model.provider}\t${form.model.model}`:'';
-        const repository=form?.isRepository===true;
-        return h('div',{className:'dgc-settings'},
-          h('h3',null,'Git commit settings'),
-          !form? h('div',{className:'dgc-subtle'},loadError||'Loading…') : [
-            h('label',{className:'dgc-field',key:'global'},'Global commit instruction',
-              h('textarea',{value:form.globalInstruction,onChange:e=>update('globalInstruction',e.target.value),
-                onBlur:()=>{void saverRef.current?.flush();},placeholder:'Shared conventions for every repository'})),
-            h('label',{className:'dgc-field',key:'model'},'Model',h('select',{value:choice,onChange:e=>{
-              const value=e.target.value;
-              const item=models.find(m=>`${m.provider}\t${m.model}`===value);
-              update('model',item?{provider:item.provider,model:item.model}:null,true);
-            }},
-              h('option',{value:''},defaultModel ? `DSH default (${defaultModel.provider}/${defaultModel.model})` : 'DSH default'),
-              ...models.map(model=>h('option',{key:`${model.provider}/${model.model}`,value:`${model.provider}\t${model.model}`},`${model.providerName} / ${model.name}`))
-            )),
-            h('hr',{key:'divider',className:'dgc-settings-divider'}),
-            repository ? [
+        const repository = form?.isRepository === true;
+        const selectedModelKey = selection => selection ? `${selection.provider}\t${selection.model}` : '';
+        const modelChoices = selected => {
+          const entries = models.map(entry => h('option',{
+            key:`${entry.provider}/${entry.model}`,value:`${entry.provider}\t${entry.model}`,
+          },`${entry.providerName} / ${entry.name}`));
+          if (selected && !models.some(entry => entry.provider === selected.provider && entry.model === selected.model)) {
+            entries.unshift(h('option',{key:'selected-unknown',value:selectedModelKey(selected)},
+              `${selected.provider} / ${selected.model}`));
+          }
+          return entries;
+        };
+        // Always display the model currently inherited, even if the global selector
+        // is set to DSH default (which can itself change independently).
+        const effectiveGlobalModel = form?.model ?? defaultModel ?? models[0] ?? null;
+        const inheritedModelName = effectiveGlobalModel ? (() => {
+          const entry = models.find(item => item.provider === effectiveGlobalModel.provider
+            && item.model === effectiveGlobalModel.model);
+          return entry ? `${entry.providerName} / ${entry.name}`
+            : `${effectiveGlobalModel.provider} / ${effectiveGlobalModel.model}`;
+        })() : 'Not configured';
+        const tabs = h('div',{className:'dgc-tabs',role:'tablist','aria-label':'Git commit settings scope'},
+          ...['repository','global'].map(tab => h('button',{
+            type:'button',key:tab,role:'tab',id:`dgc-tab-${tab}`,
+            'aria-label':tab === 'repository' ? 'Repository' : 'Global',
+            'aria-selected':activeTab === tab, 'aria-controls':`dgc-panel-${tab}`,
+            tabIndex:activeTab === tab ? 0 : -1,
+            className:'dgc-tab',onClick:()=>setActiveTab(tab),
+            onKeyDown:event=>{
+              const next = event.key === 'ArrowLeft' ? 'repository'
+                : event.key === 'ArrowRight' ? 'global'
+                  : event.key === 'Home' ? 'repository' : event.key === 'End' ? 'global' : null;
+              if (next) {
+                event.preventDefault();
+                setActiveTab(next);
+                event.currentTarget.parentElement?.querySelector?.(`#dgc-tab-${next}`)?.focus?.();
+              }
+            },
+          },tab === 'repository' ? 'Repository' : 'Global')));
+        const modelSelect = (key,value,onChange,firstLabel,firstValue) => h('label',{
+          className:'dgc-field',key,
+        },'Model',h('select',{'aria-label':activeTab === 'repository' ? 'Repository model' : 'Global model',
+          value,onChange,
+        },h('option',{value:firstValue},firstLabel),...modelChoices(
+          activeTab === 'repository' ? form.repositoryModel : form.model)));
+        const content = !form ? null : activeTab === 'repository'
+          ? (repository ? [
+              modelSelect('repository-model',form.repositoryModel ? selectedModelKey(form.repositoryModel) : 'inherit-global',e=>{
+                const choice=e.target.value;
+                const selected=models.find(entry=>selectedModelKey(entry)===choice);
+                update('repositoryModel',choice==='inherit-global'?null:selected
+                  ? {provider:selected.provider,model:selected.model} : form.repositoryModel,true);
+              },`Inherit Global (${inheritedModelName})`,'inherit-global'),
+              h('hr',{key:'repository-divider',className:'dgc-settings-divider'}),
               h('label',{className:'dgc-check',key:'inherit'},
-                h('input',{type:'checkbox',checked:form.inheritGlobal,onChange:e=>update('inheritGlobal',e.target.checked,true)}),
+                h('input',{type:'checkbox',checked:form.inheritGlobal,
+                  onChange:e=>update('inheritGlobal',e.target.checked,true)}),
                 'Inherit global instruction'),
               h('label',{className:'dgc-field',key:'repo'},'Repository commit instruction',
                 h('textarea',{value:form.repositoryInstruction,onChange:e=>update('repositoryInstruction',e.target.value),
                   onBlur:()=>{void saverRef.current?.flush();},placeholder:'Repository-specific commit conventions'})),
               h('code',{className:'dgc-repo-path',key:'path'},form.root),
-            ] : h('div',{className:'dgc-subtle',key:'no-repo'},'Not a git repository'),
-            h('hr',{key:'visibilityDivider',className:'dgc-settings-divider'}),
-            h('label',{className:'dgc-check',key:'autoHideNonGit'},
-              h('input',{type:'checkbox',checked:form.autoHideNonGit===true,
-                onChange:e=>update('autoHideNonGit',e.target.checked,true)}),
-              'Automatically hide floating window in non-git projects'),
-            h('label',{className:'dgc-check',key:'showTokenDetails'},
-              h('input',{type:'checkbox',checked:form.showTokenDetails===true,
-                onChange:e=>update('showTokenDetails',e.target.checked,true)}),
-              'Show token details'),
-            h('label',{className:'dgc-countdown-color',key:'countdownColor'},
-              h('span',null,'Countdown color'),
-              h('input',{type:'color',value:colorOrDefault(form.countdownColor),
-                'aria-label':'Countdown color',title:'Countdown color',
-                onChange:e=>update('countdownColor',e.target.value,true)})),
-            h('hr',{key:'positionDivider',className:'dgc-settings-divider'}),
-            h('button',{type:'button',key:'resetPosition',className:'dgc-reset-position',
-              'aria-label':'Reset floating window position',title:'Reset floating window position',
-              onClick:()=>{
-                floatingPosition.set(DEFAULT_POSITION);
-                setSaveError('');
-                void persistPosition(DEFAULT_POSITION,cwd,setSaveError);
-              }},'Reset floating window position'),
-          ],
+            ] : h('div',{className:'dgc-subtle',key:'no-repo'},'Not a git repository'))
+          : [
+              h('label',{className:'dgc-field',key:'global'},'Global commit instruction',
+                h('textarea',{value:form.globalInstruction,onChange:e=>update('globalInstruction',e.target.value),
+                  onBlur:()=>{void saverRef.current?.flush();},placeholder:'Shared conventions for every repository'})),
+              modelSelect('global-model',selectedModelKey(form.model),e=>{
+                const choice=e.target.value;
+                const selected=models.find(entry=>selectedModelKey(entry)===choice);
+                update('model',!choice?null:selected
+                  ? {provider:selected.provider,model:selected.model}:form.model,true);
+              },defaultModel
+                ? `DSH default (${defaultModel.provider}/${defaultModel.model})` : 'DSH default',''),
+              h('hr',{key:'global-divider',className:'dgc-settings-divider'}),
+              h('label',{className:'dgc-check',key:'autoHideNonGit'},
+                h('input',{type:'checkbox',checked:form.autoHideNonGit===true,
+                  onChange:e=>update('autoHideNonGit',e.target.checked,true)}),
+                'Automatically hide floating window in non-git projects'),
+              h('label',{className:'dgc-check',key:'showTokenDetails'},
+                h('input',{type:'checkbox',checked:form.showTokenDetails===true,
+                  onChange:e=>update('showTokenDetails',e.target.checked,true)}),
+                'Show token details'),
+              h('label',{className:'dgc-countdown-color',key:'countdownColor'},
+                h('span',null,'Countdown color'),
+                h('input',{type:'color',value:colorOrDefault(form.countdownColor),
+                  'aria-label':'Countdown color',title:'Countdown color',
+                  onChange:e=>update('countdownColor',e.target.value,true)})),
+              h('hr',{key:'positionDivider',className:'dgc-settings-divider'}),
+              h('button',{type:'button',key:'resetPosition',className:'dgc-reset-position',
+                'aria-label':'Reset floating window position',title:'Reset floating window position',
+                onClick:()=>{
+                  floatingPosition.set(DEFAULT_POSITION);
+                  setSaveError('');
+                  void persistPosition(DEFAULT_POSITION,cwd,setSaveError);
+                }},'Reset floating window position'),
+            ];
+        return h('div',{className:'dgc-settings'},
+          h('h3',null,'Git commit settings'),
+          tabs,
+          !form ? h('div',{className:'dgc-subtle'},loadError||'Loading…')
+            : h('div',{className:'dgc-tab-panel',role:'tabpanel',id:`dgc-panel-${activeTab}`,
+              'aria-labelledby':`dgc-tab-${activeTab}`},content),
           saveError ? h('div',{className:'dgc-notice dgc-save-error',role:'alert'},saveError) : null,
           form && loadError ? h('div',{className:'dgc-notice dgc-error',role:'alert'},loadError) : null
         );

package/lib/core/service.js

@@ -44,8 +44,11 @@ export class GitCommitService {
   }
   async saveSettings(request) {
     const root = await this.settingsRoot(request);
-    if (request?.patch?.model) {
-      await this.ctx.llm.resolveModelInfo(request.patch.model.provider, request.patch.model.model);
+    // Both selectors use the same DSH model catalog, with independent scopes.
+    for (const key of ['model', 'repositoryModel']) {
+      if (request?.patch?.[key]) {
+        await this.ctx.llm.resolveModelInfo(request.patch[key].provider, request.patch[key].model);
+      }
     }
     return { ...(await this.store.save(root, request.patch)), isRepository: root !== null, root };
   }
@@ -65,7 +68,7 @@ export class GitCommitService {
     return { models, defaultModel };
   }
   async chosenModel(settings) {
-    const selected = settings.model ?? (await this.models()).defaultModel ?? (await this.models()).models[0];
+    const selected = settings.repositoryModel ?? settings.model ?? (await this.models()).defaultModel ?? (await this.models()).models[0];
     if (!selected) throw new Error('No configured DSH model is available');
     const provider = selected.provider, model = selected.model;
     const info = await this.ctx.llm.resolveModelInfo(provider, model);

package/lib/core/store.js

@@ -18,6 +18,17 @@ const string = (value, field, limit = 12000) => {
   if (typeof value !== 'string' || value.length > limit) throw new Error(`${field} must be a string of at most ${limit} characters`);
   return value;
 };
+/** null is the fixed 'inherit global' marker for repository model selection. */
+const storedModel = value => plain(value) && typeof value.provider === 'string' && value.provider.length > 0
+  && typeof value.model === 'string' && value.model.length > 0
+  ? { provider: value.provider, model: value.model } : null;
+const checkedModel = (value, key) => {
+  if (value === null) return null;
+  if (!plain(value) || typeof value.provider !== 'string' || typeof value.model !== 'string'
+    || !value.provider || !value.model) throw new Error(`Invalid ${key} selection`);
+  return { provider: string(value.provider, `${key}.provider`, 200),
+    model: string(value.model, `${key}.model`, 400) };
+};
 
 export class InstructionStore {
   constructor(path = join(HOME(), 'dsh-git-commit.json')) {
@@ -37,8 +48,8 @@ export class InstructionStore {
   async get(root) {
     const data = await this.read();
     const repo = typeof root === 'string' && plain(data.repositories[root]) ? data.repositories[root] : {};
-    const rawModel = data.global?.model;
-    const model = plain(rawModel) && typeof rawModel.provider === 'string' && typeof rawModel.model === 'string' ? { provider: rawModel.provider, model: rawModel.model } : null;
+    const model = storedModel(data.global?.model);
+    const repositoryModel = storedModel(repo.model);
     return {
       globalInstruction: typeof data.global?.instruction === 'string' ? data.global.instruction : '',
       autoHideNonGit: data.global?.autoHideNonGit === true,
@@ -49,12 +60,13 @@ export class InstructionStore {
       repositoryInstruction: typeof repo.instruction === 'string' ? repo.instruction : '',
       inheritGlobal: repo.inheritGlobal !== false,
       model,
+      repositoryModel,
     };
   }
   async save(root, patch) {
-    const allowed = ['globalInstruction', 'repositoryInstruction', 'inheritGlobal', 'model', 'autoHideNonGit', 'showTokenDetails', 'countdownColor', 'floatingPosition'];
+    const allowed = ['globalInstruction', 'repositoryInstruction', 'inheritGlobal', 'model', 'repositoryModel', 'autoHideNonGit', 'showTokenDetails', 'countdownColor', 'floatingPosition'];
     if (!plain(patch) || Object.keys(patch).some(key => !allowed.includes(key))) throw new Error('Unknown commit setting');
-    if (root === null && ('repositoryInstruction' in patch || 'inheritGlobal' in patch)) {
+    if (root === null && ('repositoryInstruction' in patch || 'inheritGlobal' in patch || 'repositoryModel' in patch)) {
       throw new Error('Repository-specific settings require a Git repository');
     }
     if (root !== null && (typeof root !== 'string' || !root)) throw new Error('Invalid repository scope');
@@ -89,13 +101,8 @@ export class InstructionStore {
         if (typeof patch.inheritGlobal !== 'boolean') throw new Error('inheritGlobal must be a boolean');
         current.inheritGlobal = patch.inheritGlobal;
       }
-      if ('model' in patch) {
-        if (patch.model !== null && (!plain(patch.model) || !patch.model.provider || !patch.model.model)) throw new Error('Invalid model selection');
-        global.model = patch.model === null ? null : {
-          provider: string(patch.model.provider, 'model.provider', 200),
-          model: string(patch.model.model, 'model.model', 400),
-        };
-      }
+      if ('model' in patch) global.model = checkedModel(patch.model, 'model');
+      if ('repositoryModel' in patch) current.model = checkedModel(patch.repositoryModel, 'repositoryModel');
       data.global = global;
       if (root !== null) data.repositories[root] = current;
       await mkdir(dirname(this.path), { recursive: true });

package/lib/index.d.ts

@@ -51,7 +51,10 @@ export interface GitCommitSettings {
   countdownColor: string;
   /** Null means default lower-right anchor. Otherwise saved top/right coordinates in CSS pixels. */
   floatingPosition: {right:number;top:number} | null;
+  /** Global model selection, null means use the DSH default. */
   model: { provider: string; model: string } | null;
+  /** Repository-only override; null means inherit the global model selection (fixed UI option value). */
+  repositoryModel: { provider: string; model: string } | null;
   /** True for a Git working tree; false for global-only settings in ordinary directories. */
   isRepository: boolean;
   /** Canonical Git root, or null outside a repository. */
@@ -67,7 +70,7 @@ export interface GitCommitApi {
   >;
   changeToken(request: GitCommitRequest): Promise<{ token: number | null }>;
   settings(request?: GitCommitRequest): Promise<GitCommitSettings>;
-  saveSettings(request: GitCommitRequest & { patch: Partial<Pick<GitCommitSettings, 'globalInstruction' | 'repositoryInstruction' | 'inheritGlobal' | 'model' | 'autoHideNonGit' | 'showTokenDetails' | 'countdownColor' | 'floatingPosition'>> }): Promise<GitCommitSettings>;
+  saveSettings(request: GitCommitRequest & { patch: Partial<Pick<GitCommitSettings, 'globalInstruction' | 'repositoryInstruction' | 'inheritGlobal' | 'model' | 'repositoryModel' | 'autoHideNonGit' | 'showTokenDetails' | 'countdownColor' | 'floatingPosition'>> }): Promise<GitCommitSettings>;
   models(): Promise<{ models: Array<{provider:string;providerName:string;model:string;name:string}>; defaultModel: {provider:string;model:string}|null }>;
 }
 declare module '@deepseek-ai/cordis' {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibobbyts/dsh-git-commit",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "description": "Floating Git stats and AI commits with native DSH LLM, authenticated RPC, settings and shared service",
   "license": "MIT",