dsh-taskboard 0.6.2 → 0.6.4

package/src/client/controller.ts

@@ -7,7 +7,7 @@
  *
  * @module dsh-taskboard/client/controller
  */
-import type { ChangeEvent, DiagnosticsResponse, DiffResponse, ImportCommitResponse, ImportPreviewResponse, PromptCompletionsResponse, TaskTemplate, TaskTemplateSpec, UpdateTaskBody, WorkspaceView } from '../shared/api.ts'
+import type { ChangeEvent, DiagnosticsResponse, DiffResponse, ImportCommitResponse, ImportPreviewResponse, MergeRepoResult, PromptCompletionsResponse, TaskTemplate, TaskTemplateSpec, UpdateTaskBody, WorkspaceView } from '../shared/api.ts'
 import type { ChecklistItem, TaskLedger, TaskRecord, Urgency } from '../shared/protocol.ts'
 import { emptyLedger } from '../shared/protocol.ts'
 import type { TaskboardClient } from './api.ts'
@@ -277,6 +277,12 @@ export class BoardController {
     return this.state.workspaces.find(w => w.id === workspaceId)?.gitAvailable === true
   }
 
+  /** How many repos a task mirror of this workspace would cover (0.6.3 mirror badge). */
+  repoCount(workspaceId: string | undefined): number {
+    if (workspaceId === undefined) return 1
+    return this.state.workspaces.find(w => w.id === workspaceId)?.repoCount ?? 1
+  }
+
   /**
    * Install the session-jump bridge (built from the runtime sessions service
    * by the client entry). Without it openSession reports 'unavailable'.
@@ -473,8 +479,8 @@ export class BoardController {
     }
   }
 
-  /** Diff view (0.4.0): one execution's commit or changed path; errors surface via throw. */
-  async fetchDiff(taskId: string, query: { execution: string; commit?: string; path?: string }): Promise<DiffResponse | undefined> {
+  /** Diff view (0.4.0): one execution's commit or changed path; `repo` picks a mirror repo (0.6.3). */
+  async fetchDiff(taskId: string, query: { execution: string; commit?: string; path?: string; repo?: string }): Promise<DiffResponse | undefined> {
     try {
       return await this.client.diff(taskId, query)
     } catch (error) {
@@ -520,13 +526,16 @@ export class BoardController {
 
   /**
    * ⇥ 合并 (detail page): merge the task branch into the main worktree.
-   * @returns the outcome; `noop` means the branch had no new commits (nothing merged).
+   * @returns the outcome; `noop` means the branch had no new commits (nothing
+   * merged); multi-repo tasks (0.6.3) additionally carry per-repo `results`.
    */
-  async mergeBranch(id: string): Promise<{ ok: true; noop?: boolean } | { ok: false; error: string }> {
+  async mergeBranch(id: string): Promise<{ ok: true; noop?: boolean; results?: MergeRepoResult[] } | { ok: false; error: string }> {
     try {
       const value = await this.client.mergeBranch(id)
       await this.refresh()
-      return value.noop === true ? { ok: true, noop: true } : { ok: true }
+      return value.noop === true
+        ? { ok: true, noop: true }
+        : value.results !== undefined ? { ok: true, results: value.results } : { ok: true }
     } catch (error) {
       return { ok: false, error: error instanceof Error ? error.message : String(error) }
     }

package/src/client/i18n/en.ts

@@ -166,6 +166,9 @@ export const en: TaskboardDict = {
   'iso.merge.button': '⇥ Merge into main worktree',
   'iso.merge.failed': 'Merge failed: {error}',
   'iso.merge.noop': 'The branch has no commits ahead of the main worktree — nothing to merge (send it back to continue running, or clean it up)',
+  'iso.merge.done': 'Merged per repo (--no-ff): {summary}',
+  'iso.merge.partial': 'Some repos failed to merge: {summary}\n{error}',
+  'iso.repo.root': 'Root repo',
   'iso.remove.wt': '🗑 Remove worktree',
   'iso.remove.wtTitle': 'git worktree remove (refused when uncommitted changes exist)',
   'iso.remove.wtb': '🗑 Remove worktree + branch',
@@ -290,6 +293,7 @@ export const en: TaskboardDict = {
   'form.iso.noneHintNonGit': 'Not a git repository; will run in the project directory',
   'form.iso.noneHint': 'No git; works directly in the project directory',
   'form.iso.nonGitNote': 'This project is not a git repository; the task will run in its directory (still created with the default configuration; the runtime degrades automatically)',
+  'form.iso.mirrorNote': 'Multi-repo workspace: worktree isolation automatically mirrors all {n} repos — one task branch each, merged per repo at acceptance',
   'form.field.checklist': 'Acceptance checklist (DoD)',
   'form.field.checklistOptional': 'Acceptance checklist (DoD, optional)',
   'form.check.itemPlaceholder': 'Checklist item {n} (definition of done)',
@@ -361,7 +365,7 @@ export const en: TaskboardDict = {
   'set.subtitle': 'Global defaults for new tasks and session sync',
   'set.iso.heading': 'Default execution isolation',
   'set.iso.noneHint': 'No git; works directly in the project directory (factory default)',
-  'set.iso.worktreeHint': 'Each execution runs on its own worktree branch (task/title+ID), isolated from the others',
+  'set.iso.worktreeHint': 'Each execution runs on its own worktree branch (task/title+ID), isolated from the others; multi-repo workspaces are mirrored whole (one branch per repo)',
   'set.iso.current': 'Currently saved default: {current}. Affects only tasks created hereafter; existing tasks keep their creation-time choice, and non-git projects still degrade to the project directory at run time.',
   'set.sync.heading': 'Auto-sync workspace sessions',
   'set.sync.off.name': '🚫 Sync off',

package/src/client/i18n/runtime.ts

@@ -55,6 +55,24 @@ let unsubscribeService: (() => void) | undefined
 let snapshot: TaskboardLocaleSnapshot = { active: detectFallbackLocale(), revision: 0 }
 const listeners = new Set<() => void>()
 
+// Late attach (issue #16): the taskboard client injects NOTHING, so it can
+// activate BEFORE the locale service provides — and before the locale
+// runtime syncs <html lang> (the server-rendered static value is "en").
+// Until a real service attaches, a MutationObserver re-detects on every
+// <html lang> change and a short poll re-tries ctx.get('locale').
+let langObserver: MutationObserver | undefined
+let retryTimer: ReturnType<typeof setInterval> | undefined
+
+/** Stop every late-attach mechanism (a service took over, or dispose). */
+function clearLateAttach(): void {
+  if (retryTimer !== undefined) {
+    clearInterval(retryTimer)
+    retryTimer = undefined
+  }
+  try { langObserver?.disconnect() } catch { /* observer already dead */ }
+  langObserver = undefined
+}
+
 function isLocaleId(value: string): value is LocaleId {
   return value === 'zh' || value === 'en'
 }
@@ -80,6 +98,45 @@ function detectFallbackLocale(): LocaleId {
   return 'en'
 }
 
+/** Coerce an unknown ctx value into a usable service face, else undefined. */
+function asLocaleService(value: unknown): LocaleServiceFace | undefined {
+  const face = value as LocaleServiceFace | null | undefined
+  if (face === null || face === undefined || typeof face.getSnapshot !== 'function' || typeof face.subscribe !== 'function') return undefined
+  return face
+}
+
+/**
+ * Watch for the late locale activation while no service is attached
+ * (issue #16): re-detect on <html lang> changes (the locale runtime syncs
+ * it once up) and poll ctx.get('locale') briefly (inject ordering — the
+ * service may provide a moment after our apply).
+ */
+function startLateAttach(retryGetLocale: (() => unknown) | undefined): void {
+  clearLateAttach()
+  try {
+    if (typeof MutationObserver !== 'undefined' && typeof document !== 'undefined') {
+      langObserver = new MutationObserver(() => {
+        if (service !== undefined) return // a real service owns the state
+        const next = detectFallbackLocale()
+        if (next !== snapshot.active) publish({ active: next, revision: snapshot.revision + 1 })
+      })
+      langObserver.observe(document.documentElement, { attributes: true, attributeFilter: ['lang'] })
+    }
+  } catch { /* no DOM — the poll below still covers service-side activation */ }
+  if (retryGetLocale === undefined) return
+  let tries = 0
+  retryTimer = setInterval(() => {
+    tries += 1
+    let face: LocaleServiceFace | undefined
+    try { face = asLocaleService(retryGetLocale()) } catch { face = undefined }
+    if (face !== undefined) {
+      initI18n(face) // attaches the service and tears the late attach down
+      return
+    }
+    if (tries >= 8) clearLateAttach() // ~2s at 250ms — enough for boot ordering
+  }, 250)
+}
+
 function publish(next: TaskboardLocaleSnapshot): void {
   if (next.active === snapshot.active && next.revision === snapshot.revision) return
   snapshot = next
@@ -89,18 +146,26 @@ function publish(next: TaskboardLocaleSnapshot): void {
 /**
  * Attach the DSH locale service (call from the client entry's apply with
  * ctx.get('locale')). Absent/malformed services are ignored — the fallback
- * detection stays in charge.
+ * detection stays in charge, and (issue #16) a late attach keeps watching:
+ * the locale service can provide AFTER our activation (inject ordering), so
+ * pass `retryGetLocale` to re-poll ctx.get('locale') for ~2s and pick the
+ * service up the moment it exists; <html lang> changes re-run detection in
+ * the meantime.
  * @param localeService - the ctx 'locale' service, when provided.
+ * @param retryGetLocale - re-lookup for the service (the client entry passes
+ *   `() => ctx.get?.('locale')`); polled only while no service is attached.
  */
-export function initI18n(localeService: unknown): void {
-  const face = localeService as LocaleServiceFace | null | undefined
-  if (face === null || face === undefined || typeof face.getSnapshot !== 'function' || typeof face.subscribe !== 'function') {
+export function initI18n(localeService: unknown, retryGetLocale?: () => unknown): void {
+  const face = asLocaleService(localeService)
+  if (face === undefined) {
     // No usable service: resolve the fallback NOW so a caller that inits
     // after the DOM is up gets the current detection, never a stale
-    // module-load snapshot.
+    // module-load snapshot — then keep watching for the late activation.
     publish({ active: detectFallbackLocale(), revision: 0 })
+    startLateAttach(retryGetLocale)
     return
   }
+  clearLateAttach()
   service = face
   const sync = (): void => {
     try {
@@ -115,6 +180,7 @@ export function initI18n(localeService: unknown): void {
 
 /** Detach the service and return to fallback detection (tests, dispose). */
 export function disposeI18n(): void {
+  clearLateAttach()
   try { unsubscribeService?.() } catch { /* source already gone */ }
   unsubscribeService = undefined
   service = undefined

package/src/client/i18n/zh.ts

@@ -168,6 +168,9 @@ export const zh = {
   'iso.merge.button': '⇥ 合并到主工作区',
   'iso.merge.failed': '合并失败：{error}',
   'iso.merge.noop': '该分支没有领先主工作区的新提交，无需合并（可退回续跑或直接清理）',
+  'iso.merge.done': '已按仓库合并（--no-ff）：{summary}',
+  'iso.merge.partial': '部分仓库合并失败：{summary}\n{error}',
+  'iso.repo.root': '根仓库',
   'iso.remove.wt': '🗑 删除 worktree',
   'iso.remove.wtTitle': 'git worktree remove（有未提交修改时拒绝）',
   'iso.remove.wtb': '🗑 删 worktree + 分支',
@@ -292,6 +295,7 @@ export const zh = {
   'form.iso.noneHintNonGit': '当前项目非 git 仓库，将在原目录执行',
   'form.iso.noneHint': '不使用 git，直接在项目目录工作',
   'form.iso.nonGitNote': '当前项目非 git 仓库，将在原目录执行（任务仍按默认配置创建，运行时自动降级）',
+  'form.iso.mirrorNote': '多仓库工作区：Worktree 隔离将自动整区镜像 {n} 个仓库——每仓库独立任务分支，验收按仓库合并',
   'form.field.checklist': '验收清单（DoD）',
   'form.field.checklistOptional': '验收清单（DoD，可选）',
   'form.check.itemPlaceholder': '验收项 {n}（完成标准）',
@@ -363,7 +367,7 @@ export const zh = {
   'set.subtitle': '新建任务与会话同步的全局默认值',
   'set.iso.heading': '默认执行隔离',
   'set.iso.noneHint': '不使用 git，直接在项目目录工作（出厂默认）',
-  'set.iso.worktreeHint': '每次执行在独立 worktree 分支上进行（task/标题+ID），互不污染',
+  'set.iso.worktreeHint': '每次执行在独立 worktree 分支上进行（task/标题+ID），互不污染；多仓库工作区自动整区镜像（每仓库独立分支）',
   'set.iso.current': '当前保存的默认：{current}。仅影响之后新建的任务；已有任务保持创建时的选择，非 git 项目运行时仍自动降级原目录。',
   'set.sync.heading': '自动同步工作区会话',
   'set.sync.off.name': '🚫 关闭同步',

package/src/client/index.ts

@@ -70,8 +70,11 @@ export function apply(ctx: ClientContextFace): void {
     injectStyles()
     // Locale source (设置 → 通用设置 → 语言): soft-attached — absent on
     // compositions without the DSH locale plugin, where the fallback
-    // (<html lang> / navigator) takes over. Never a hard inject.
-    initI18n(ctx.get?.('locale'))
+    // (<html lang> / navigator) takes over. Never a hard inject. The getter
+    // rides along (issue #16): our client bundle activates with zero service
+    // deps, potentially BEFORE the locale service provides — the runtime
+    // re-polls it for ~2s and watches <html lang> until it does.
+    initI18n(ctx.get?.('locale'), () => ctx.get?.('locale'))
     const client = createClient()
     const controller = new BoardController(client)
 

package/src/client/styles.ts

@@ -622,6 +622,13 @@ button.dsh-atb-chip2.dsh-atb-chip-btn:hover {
 .dsh-atb-isolation-note { display: block; margin-top: 6px; font-size: 11px; color: var(--dsw-alias-label-tertiary, gray); }
 .dsh-atb-mode-picker[data-disabled="true"] .dsh-atb-mode-opt { cursor: not-allowed; opacity: .55; }
 .dsh-atb-iso-none { font-size: 12.5px; color: var(--dsw-alias-label-secondary, inherit); }
+.dsh-atb-iso-repo[data-multi="true"] { padding: 6px 0 2px; border-top: 1px dashed var(--dsw-alias-border-secondary, #ddd2); }
+.dsh-atb-iso-repo[data-multi="true"]:first-of-type { border-top: none; padding-top: 0; }
+.dsh-atb-iso-repohead { display: flex; flex-wrap: wrap; gap: 6px 12px; margin-bottom: 6px; align-items: baseline; }
+.dsh-atb-iso-repohead code {
+font-family: ui-monospace, Consolas, monospace; font-size: 11.5px; font-weight: 600;
+color: var(--dsw-alias-state-business-primary, #3e63dd);
+}
 .dsh-atb-iso-facts { display: flex; flex-wrap: wrap; gap: 6px 12px; margin-bottom: 8px; }
 .dsh-atb-iso-fact { font-size: 11.5px; color: var(--dsw-alias-label-secondary, inherit); }
 .dsh-atb-iso-fact b { font-weight: 600; color: var(--dsw-alias-state-business-primary, #3e63dd); }