dsh-git-worktree 0.9.2 → 0.9.3

package/scripts/dev-dsh.mjs

@@ -1,95 +1,98 @@
-#!/usr/bin/env node
-
-import { tmpdir } from 'node:os'
-import { dirname, join } from 'node:path'
-import { fileURLToPath } from 'node:url'
-import {
-  createDefaultOptions,
-  createDshLaunch,
-  discoverHarnessRoot,
-  ensureDevFixture,
-  installLocalSnapshot,
-  parseDevDshArgs,
-  removeLocalSnapshot,
-  runProcess,
-  smokeLocalSnapshot,
-} from './dev-dsh-lib.mjs'
-
-const projectRoot = dirname(dirname(fileURLToPath(import.meta.url)))
-const cacheRoot = join(tmpdir(), 'dsh-git-worktree-dev')
-const defaults = {
-  ...createDefaultOptions(projectRoot, cacheRoot),
-  harnessRoot: discoverHarnessRoot(projectRoot),
-}
-
-function printUsage() {
-  console.log(`dsh-git-worktree local development
-
-Usage:
-  pnpm run dev:dsh -- [--profile web] [--repo <git-root>] [--port 3081] [--harness <path>]
-  pnpm run dev:dsh:install -- [--profile web] [--harness <path>]
-  pnpm run dev:dsh:smoke -- [--profile web] [--harness <path>]
-  pnpm run dev:dsh:remove -- [--profile web] [--harness <path>]
-
-The install path is a local tarball under the OS temporary directory. Nothing is
-published to npm or pushed to Git. Nearby Harness source checkouts are scanned
-and a candidate with node_modules/tsx is preferred; an arbitrary checkout can be
-selected with DSH_HARNESS_ROOT or --harness. Every profile and launch command
-then uses that source CLI instead of a globally installed dsh executable. An
-explicit checkout without dependencies fails early with its pnpm install command.
-Without --repo, a marker-protected disposable Git repository is created at:
-  ${defaults.repo}
-`)
-}
-
-try {
-  if (process.argv.includes('--help') || process.argv.includes('-h')) {
-    printUsage()
-    process.exitCode = 0
-  } else {
-    const options = parseDevDshArgs(process.argv.slice(2), defaults)
-    const runtime = {
-      projectRoot,
-      profile: options.profile,
-      harnessRoot: options.harnessRoot,
-    }
-    if (options.mode === 'install') {
-      const installed = installLocalSnapshot({
-        ...runtime,
-        cacheRoot,
-      })
-      console.log(`\nLocal snapshot installed in profile "${options.profile}".`)
-      console.log(`Archive retained for profile reproducibility: ${installed.archivePath}`)
-    } else if (options.mode === 'smoke') {
-      smokeLocalSnapshot(runtime)
-      console.log(`Profile "${options.profile}" composes dsh-git-worktree.`)
-    } else if (options.mode === 'remove') {
-      removeLocalSnapshot({ ...runtime, cacheRoot })
-      console.log(`Removed dsh-git-worktree from profile "${options.profile}" and cleared local archives.`)
-    } else {
-      const installed = installLocalSnapshot({
-        ...runtime,
-        cacheRoot,
-      })
-      const fixture = ensureDevFixture(options.repo, { explicit: options.repoExplicit })
-      console.log(`\nLocal snapshot: ${installed.archivePath}`)
-      console.log(`${fixture.created ? 'Created' : 'Using'} test repository: ${fixture.path}`)
-      const launch = createDshLaunch({
-        projectRoot,
-        harnessRoot: options.harnessRoot,
-        workspaceRoot: fixture.path,
-        profile: options.profile,
-        port: options.port,
-      })
-      console.log(`Starting DSH at http://127.0.0.1:${options.port}`)
-      console.log(launch.source
-        ? `Using Harness source checkout: ${options.harnessRoot}`
-        : 'Using the installed dsh executable.')
-      console.log('Press Ctrl+C to stop. No npm/GitHub publication is performed.\n')
-      runProcess(launch.command, launch.args, { cwd: launch.cwd })
-    }
-  }
-} catch (error) {
-  console.error(`dev:dsh failed: ${error instanceof Error ? error.message : String(error)}`)
-  process.exitCode = 1
-}
+#!/usr/bin/env node
+
+import { dirname } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import {
+  createDefaultOptions,
+  createDshLaunch,
+  devCacheRoot,
+  discoverHarnessRoot,
+  ensureDevFixture,
+  installLocalSnapshot,
+  parseDevDshArgs,
+  prepareIsolatedWorkspacePatch,
+  removeLocalSnapshot,
+  runProcess,
+  smokeLocalSnapshot,
+} from './dev-dsh-lib.mjs'
+
+const projectRoot = dirname(dirname(fileURLToPath(import.meta.url)))
+const cacheRoot = devCacheRoot()
+const defaults = {
+  ...createDefaultOptions(projectRoot, cacheRoot, Boolean(process.env.DSH_HOME)),
+  harnessRoot: discoverHarnessRoot(projectRoot),
+}
+
+function printUsage() {
+  console.log(`dsh-git-worktree local development
+
+Usage:
+  pnpm run dev:dsh -- [--profile web] [--repo <git-root>] [--port 3081] [--harness <path>]
+  pnpm run dev:dsh:install -- [--profile web] [--harness <path>]
+  pnpm run dev:dsh:smoke -- [--profile web] [--harness <path>]
+  pnpm run dev:dsh:remove -- [--profile web] [--harness <path>]
+
+Nothing is published to npm or pushed to Git. Nearby Harness source checkouts
+are scanned; use DSH_HARNESS_ROOT or --harness for a specific checkout. Install
+and build that source checkout first. The source's own pnpm version is selected
+automatically. Set DSH_HOME to a fresh temporary directory to isolate the web
+Profile, archive, and default Workspace; this also patches the Host's Documents
+root to that home. Without --repo, a marker-protected disposable Git repository
+is created at:
+  ${defaults.repo}
+`)
+}
+
+try {
+  if (process.argv.includes('--help') || process.argv.includes('-h')) {
+    printUsage()
+    process.exitCode = 0
+  } else {
+    const options = parseDevDshArgs(process.argv.slice(2), defaults)
+    const runtime = {
+      projectRoot,
+      profile: options.profile,
+      harnessRoot: options.harnessRoot,
+    }
+    if (options.mode === 'install') {
+      const installed = installLocalSnapshot({
+        ...runtime,
+        cacheRoot,
+      })
+      console.log(`\nLocal snapshot installed in profile "${options.profile}".`)
+      console.log(`Archive retained for profile reproducibility: ${installed.archivePath}`)
+    } else if (options.mode === 'smoke') {
+      smokeLocalSnapshot(runtime)
+      console.log(`Profile "${options.profile}" composes dsh-git-worktree.`)
+    } else if (options.mode === 'remove') {
+      removeLocalSnapshot({ ...runtime, cacheRoot })
+      console.log(`Removed dsh-git-worktree from profile "${options.profile}" and cleared local archives.`)
+    } else {
+      const installed = installLocalSnapshot({
+        ...runtime,
+        cacheRoot,
+      })
+      const fixture = ensureDevFixture(options.repo, { explicit: options.repoExplicit })
+      console.log(`\nLocal snapshot: ${installed.archivePath}`)
+      console.log(`${fixture.created ? 'Created' : 'Using'} test repository: ${fixture.path}`)
+      const launch = createDshLaunch({
+        projectRoot,
+        harnessRoot: options.harnessRoot,
+        workspaceRoot: fixture.path,
+        profile: options.profile,
+        port: options.port,
+        ...(process.env.DSH_HOME ? { isolationPatchPath: prepareIsolatedWorkspacePatch(cacheRoot) } : {}),
+      })
+      console.log(`Starting DSH at http://127.0.0.1:${options.port}`)
+      console.log(launch.source
+        ? `Using Harness source checkout: ${options.harnessRoot}`
+        : 'Using the installed dsh executable.')
+      if (process.env.DSH_HOME) console.log(`Isolated default Workspace patch: ${launch.args[launch.args.indexOf('--patch') + 1]}`)
+      console.log('Press Ctrl+C to stop. No npm/GitHub publication is performed.\n')
+      runProcess(launch.command, launch.args, { cwd: launch.cwd })
+    }
+  }
+} catch (error) {
+  console.error(`dev:dsh failed: ${error instanceof Error ? error.message : String(error)}`)
+  process.exitCode = 1
+}

package/scripts/dsh-source-runner.mjs

@@ -1,14 +1,20 @@
-#!/usr/bin/env node
-
-import { pathToFileURL } from 'node:url'
-
-const [workspaceRoot, cliEntry, ...args] = process.argv.slice(2)
-if (!workspaceRoot || !cliEntry) {
-  throw new Error('dsh-source-runner requires <workspaceRoot> <cliEntry> [...args].')
-}
-
-// pnpm resolves tsx and the Harness workspace before this point. Switch only
-// the application cwd so newly created DSH Sessions use the intended fixture.
-process.chdir(workspaceRoot)
-process.argv = [process.execPath, cliEntry, ...args]
-await import(pathToFileURL(cliEntry).href)
+#!/usr/bin/env node
+
+import { pathToFileURL } from 'node:url'
+
+const [workspaceRoot, cliEntry, ...args] = process.argv.slice(2)
+if (!workspaceRoot || !cliEntry) {
+  throw new Error('dsh-source-runner requires <workspaceRoot> <cliEntry> [...args].')
+}
+
+// pnpm resolves tsx and the Harness workspace before this point. Switch only
+// the application cwd so newly created DSH Sessions use the intended fixture.
+process.chdir(workspaceRoot)
+process.argv = [process.execPath, cliEntry, ...args]
+const cli = await import(pathToFileURL(cliEntry).href)
+// Recent Harness CLIs guard their entry with import.meta.main; importing the
+// module from this cwd-preserving runner does not make it the Node main module.
+if (typeof cli.runCli !== 'function') {
+  throw new Error('Harness source CLI must export runCli() for the development runner.')
+}
+await cli.runCli()

package/scripts/workspace-sidebar-upstream-alpha.mjs

@@ -0,0 +1,102 @@
+import { createHash } from 'node:crypto'
+import { readFileSync } from 'node:fs'
+import { createRequire } from 'node:module'
+import { materializeWorkspaceFactory } from './workspace-sidebar-upstream-next.mjs'
+
+export const ALPHA_WORKSPACE_VERSION = '0.1.6-alpha.2'
+export const ALPHA_WORKSPACE_SHA256 = 'cec5cdfc90b0732356b678e84ee00949d26b8c1b70d4dd5fcc20660d7267e448'
+export const ALPHA_WORKSPACE_VIRTUAL_ID = 'virtual:dsh-official-workspace-client-alpha'
+export const RESOLVED_ALPHA_WORKSPACE_VIRTUAL_ID = `\0${ALPHA_WORKSPACE_VIRTUAL_ID}`
+
+export function readAlphaWorkspaceClient() {
+  const require = createRequire(import.meta.url)
+  const packageName = '@deepseek-ai/dsh-client-ui-workspace-alpha'
+  const packageJson = JSON.parse(readFileSync(require.resolve(`${packageName}/package.json`), 'utf8'))
+  if (packageJson.name !== '@deepseek-ai/dsh-client-ui-workspace' || packageJson.version !== ALPHA_WORKSPACE_VERSION) {
+    throw new Error(`Unsupported official Workspace source ${packageJson.name}@${packageJson.version}`)
+  }
+  const source = readFileSync(require.resolve(`${packageName}/client`), 'utf8')
+  const hash = createHash('sha256').update(source).digest('hex')
+  if (hash !== ALPHA_WORKSPACE_SHA256) throw new Error(`Official Workspace Client hash drifted: ${hash}`)
+  return source
+}
+
+function once(source, needle, replacement, label) {
+  const at = source.indexOf(needle)
+  if (at < 0 || at !== source.lastIndexOf(needle)) {
+    throw new Error(`Cannot derive official Workspace ${ALPHA_WORKSPACE_VERSION} ${label}: expected one source seam`)
+  }
+  return source.slice(0, at) + replacement + source.slice(at + needle.length)
+}
+
+/** Keep the official alpha Client while disabling unsafe managed-owner row mutations. */
+export function decorateAlphaWorkspaceClient(source) {
+  let derived = source
+  const replace = (needle, replacement, label) => { derived = once(derived, needle, replacement, label) }
+  replace(
+    '\t\t\t\tgroups.push(buildGroup(workspace.workspaceId, workspace.workspaceId, workspace.path, Date.parse(workspace.createdAt), workspace.title, members));',
+    '\t\t\t\tconst group = buildGroup(workspace.workspaceId, workspace.workspaceId, workspace.path, Date.parse(workspace.createdAt), workspace.title, members);\n\t\t\t\tif (workspace.__dshGitWorktreeProtected === true) group.__dshGitWorktreeProtected = true;\n\t\t\t\tgroups.push(group);',
+    'protected workspace group',
+  )
+  replace(
+    '\t\t\t\t\tlabel: g.label,\n\t\t\t\t\tsessionCount: g.sessions.length,',
+    '\t\t\t\t\tlabel: g.label,\n\t\t\t\t\t...g.__dshGitWorktreeProtected === true ? { __dshGitWorktreeProtected: true } : {},\n\t\t\t\t\tsessionCount: g.sessions.length,',
+    'protected workspace row',
+  )
+  replace(
+    '\t\t\tasync forkSession(sessionId) {\n\t\t\t\tconst navigation = AbortSignal.any([this.ctx.layout.beginNavigation(), this.lifetime.signal]);',
+    '\t\t\tasync forkSession(sessionId) {\n\t\t\t\tif (this.ctx.get("__dshGitWorktreeManagedGuard").blockSession(sessionId)) throw new Error("managed Session must be changed through its Worktree owner");\n\t\t\t\tconst navigation = AbortSignal.any([this.ctx.layout.beginNavigation(), this.lifetime.signal]);',
+    'managed Session fork',
+  )
+  replace(
+    '\t\t\tasync archiveSession(sessionId) {\n\t\t\t\tawait this.workspaces.archiveSession(sessionId);',
+    '\t\t\tasync archiveSession(sessionId) {\n\t\t\t\tif (this.ctx.get("__dshGitWorktreeManagedGuard").blockSession(sessionId)) throw new Error("managed Session must be changed through its Worktree owner");\n\t\t\t\tawait this.workspaces.archiveSession(sessionId);',
+    'managed Session archive',
+  )
+  replace(
+    '\t\t\t\tconst target = workspaceId ?? currentWorkspaceId ?? recent;\n\t\t\t\tif (target === void 0) {',
+    '\t\t\t\tconst target = workspaceId ?? currentWorkspaceId ?? recent;\n\t\t\t\tif (target !== void 0 && this.ctx.get("__dshGitWorktreeManagedGuard").blockWorkspace(target)) return;\n\t\t\t\tif (target === void 0) {',
+    'managed Workspace new Session shortcut',
+  )
+  replace(
+    '\t\t\t\trenameSession: async (sessionId, title) => {\n\t\t\t\t\tconst result = await sessions.using(',
+    '\t\t\t\trenameSession: async (sessionId, title) => {\n\t\t\t\t\tif (ctx.get("__dshGitWorktreeManagedGuard").blockSession(sessionId)) throw new Error("managed Session must be changed through its Worktree owner");\n\t\t\t\t\tconst result = await sessions.using(',
+    'managed Session rename',
+  )
+  replace(
+    '\t\t\t\tupdatedAt: s.updatedAt,\n\t\t\t\t...pendingInteraction === void 0 ? {} : { pendingInteraction }',
+    '\t\t\t\tupdatedAt: s.updatedAt,\n\t\t\t\t__dshGitWorktree: s.__dshGitWorktree,\n\t\t\t\t...pendingInteraction === void 0 ? {} : { pendingInteraction }',
+    'managed Session metadata',
+  )
+  replace(
+    '\t\tfunction ProjectRowItem({ group, containsCurrentDescendant = false, onToggle, onCreate, actions, drag, home, t }) {\n\t\t\tconst row = group;',
+    '\t\tfunction ProjectRowItem({ group, containsCurrentDescendant = false, onToggle, onCreate, actions, drag, home, t }) {\n\t\t\tconst row = group;\n\t\t\tconst protectedManagedWorkspace = row.__dshGitWorktreeProtected === true;',
+    'managed Workspace row guard',
+  )
+  replace('\t\t\t\tdraggable: drag !== void 0,', '\t\t\t\tdraggable: drag !== void 0 && !protectedManagedWorkspace,', 'managed Workspace drag')
+  replace('\t\t\t\tonDragStart: drag === void 0 ? void 0 : (e) => {', '\t\t\t\tonDragStart: protectedManagedWorkspace || drag === void 0 ? void 0 : (e) => {', 'managed Workspace drag start')
+  replace('\t\t\t\t\t\tchildren: [actions !== void 0 && (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Menu, {', '\t\t\t\t\t\tchildren: [!protectedManagedWorkspace && actions !== void 0 && (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Menu, {', 'managed Workspace menu')
+  replace('\t\t\t\t\t\t}), (0, react_jsx_runtime.jsx)("button", {\n\t\t\t\t\t\t\ttype: "button",\n\t\t\t\t\t\t\tclassName: Rows_module_css_default.iconButton,\n\t\t\t\t\t\t\t"aria-label": t("actions.newSession.aria", { name: label }),', '\t\t\t\t\t\t}), !protectedManagedWorkspace && (0, react_jsx_runtime.jsx)("button", {\n\t\t\t\t\t\t\ttype: "button",\n\t\t\t\t\t\t\tclassName: Rows_module_css_default.iconButton,\n\t\t\t\t\t\t\t"aria-label": t("actions.newSession.aria", { name: label }),', 'managed Workspace new Session')
+  replace(
+    '\t\tfunction SessionNodeItem({ node, currentId, now, onOpen, onRename, onFork, onArchive, onReveal, drag, flat = false, t }) {\n\t\t\tconst row = node;',
+    '\t\tfunction SessionNodeItem({ node, currentId, now, onOpen, onRename, onFork, onArchive, onReveal, drag, flat = false, t }) {\n\t\t\tconst row = node;\n\t\t\tconst protectedManagedSession = node.__dshGitWorktree?.kind === "managed-worktree";',
+    'managed Session row guard',
+  )
+  replace('\t\t\tconst draggable = drag !== void 0 && !row.blank;', '\t\t\tconst draggable = drag !== void 0 && !row.blank && !protectedManagedSession;', 'managed Session drag')
+  replace('\t\t\t\t\t\t!row.blank && (0, react_jsx_runtime.jsx)("span", {\n\t\t\t\t\t\t\tclassName: Rows_module_css_default.rowActions,', '\t\t\t\t\t\t!row.blank && !protectedManagedSession && (0, react_jsx_runtime.jsx)("span", {\n\t\t\t\t\t\t\tclassName: Rows_module_css_default.rowActions,', 'managed Session actions')
+  replace(
+    '\t\t\t\t\t\t(0, react_jsx_runtime.jsx)("span", {\n\t\t\t\t\t\t\tref: titleRef,\n\t\t\t\t\t\t\tclassName: Rows_module_css_default.title,',
+    '\t\t\t\t\t\tprotectedManagedSession && (0, react_jsx_runtime.jsx)("span", { title: node.__dshGitWorktree.label, "aria-label": node.__dshGitWorktree.label, style: { flexShrink: 0, display: "inline-flex" }, children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconBranchOutline16, {}) }),\n\t\t\t\t\t\t(0, react_jsx_runtime.jsx)("span", {\n\t\t\t\t\t\t\tref: titleRef,\n\t\t\t\t\t\t\tclassName: Rows_module_css_default.title,',
+    'managed Session branch decoration',
+  )
+  replace(
+    '\t\t\t\t\t\t\tchildren: title\n\t\t\t\t\t\t}),\n\t\t\t\t\t\trow.hasActiveSchedule && (0, react_jsx_runtime.jsx)(ActiveScheduleIndicator, { t }),',
+    '\t\t\t\t\t\t\tchildren: title\n\t\t\t\t\t\t}),\n\t\t\t\t\t\tprotectedManagedSession && (0, react_jsx_runtime.jsx)("span", { className: "dsh-git-worktree-sidebar-badge", "data-worktree-state": node.__dshGitWorktree.state, children: node.__dshGitWorktree.label }),\n\t\t\t\t\t\trow.hasActiveSchedule && (0, react_jsx_runtime.jsx)(ActiveScheduleIndicator, { t }),',
+    'managed Session status badge',
+  )
+  return derived
+}
+
+export function materializeAlphaWorkspaceClientModule() {
+  return materializeWorkspaceFactory(decorateAlphaWorkspaceClient(readAlphaWorkspaceClient()))
+}

package/scripts/workspace-sidebar-upstream-next.mjs

@@ -0,0 +1,134 @@
+import { createHash } from 'node:crypto'
+import { readFileSync } from 'node:fs'
+import { createRequire } from 'node:module'
+
+export const NEXT_WORKSPACE_VERSION = '0.1.7-rc.2'
+export const NEXT_WORKSPACE_SHA256 = '854722447794b79607651e6c75d0652db1aba376324f468ab8cd6ecdfe7d177f'
+export const NEXT_WORKSPACE_VIRTUAL_ID = 'virtual:dsh-official-workspace-client-next'
+export const RESOLVED_NEXT_WORKSPACE_VIRTUAL_ID = `\0${NEXT_WORKSPACE_VIRTUAL_ID}`
+
+export function readNextWorkspaceClient() {
+  const require = createRequire(import.meta.url)
+  const packageName = '@deepseek-ai/dsh-client-ui-workspace-next'
+  const packageJson = JSON.parse(readFileSync(require.resolve(`${packageName}/package.json`), 'utf8'))
+  if (packageJson.name !== '@deepseek-ai/dsh-client-ui-workspace' || packageJson.version !== NEXT_WORKSPACE_VERSION) {
+    throw new Error(`Unsupported official Workspace source ${packageJson.name}@${packageJson.version}`)
+  }
+  const source = readFileSync(require.resolve(`${packageName}/client`), 'utf8')
+  const hash = createHash('sha256').update(source).digest('hex')
+  if (hash !== NEXT_WORKSPACE_SHA256) throw new Error(`Official Workspace Client hash drifted: ${hash}`)
+  return source
+}
+
+function once(source, needle, replacement, label) {
+  const start = source.indexOf(needle)
+  if (start < 0 || start !== source.lastIndexOf(needle)) {
+    throw new Error(`Cannot derive official Workspace ${NEXT_WORKSPACE_VERSION} ${label}: expected one source seam`)
+  }
+  return source.slice(0, start) + replacement + source.slice(start + needle.length)
+}
+
+/** Keep the official Client's tree and behavior, changing only managed-owner presentation/controls. */
+export function decorateNextWorkspaceClient(source) {
+  let derived = source
+  const replace = (needle, replacement, label) => { derived = once(derived, needle, replacement, label) }
+  replace(
+    '\t\t\t\tgroups.push(buildGroup(workspace.workspaceId, workspace.workspaceId, workspace.path, Date.parse(workspace.createdAt), workspace.title, members));',
+    '\t\t\t\tconst group = buildGroup(workspace.workspaceId, workspace.workspaceId, workspace.path, Date.parse(workspace.createdAt), workspace.title, members);\n\t\t\t\tif (workspace.__dshGitWorktreeProtected === true) group.__dshGitWorktreeProtected = true;\n\t\t\t\tgroups.push(group);',
+    'protected workspace group',
+  )
+  replace(
+    '\t\t\t\t\tlabel: g.label,\n\t\t\t\t\tsessionCount: g.sessions.length,',
+    '\t\t\t\t\tlabel: g.label,\n\t\t\t\t\t...g.__dshGitWorktreeProtected === true ? { __dshGitWorktreeProtected: true } : {},\n\t\t\t\t\tsessionCount: g.sessions.length,',
+    'protected workspace row',
+  )
+  replace(
+    '\t\t\tasync forkSession(sessionId) {\n\t\t\t\tawait this.sessions.fork({',
+    '\t\t\tasync forkSession(sessionId) {\n\t\t\t\tif (this.ctx.get("__dshGitWorktreeManagedGuard").blockSession(sessionId)) throw new Error("managed Session must be changed through its Worktree owner");\n\t\t\t\tawait this.sessions.fork({',
+    'managed Session fork from official menu and shortcuts',
+  )
+  replace(
+    '\t\t\tasync archiveSession(sessionId, options = {}) {\n\t\t\t\tawait this.workspaces.archiveSession(sessionId, options);',
+    '\t\t\tasync archiveSession(sessionId, options = {}) {\n\t\t\t\tif (this.ctx.get("__dshGitWorktreeManagedGuard").blockSession(sessionId)) throw new Error("managed Session must be changed through its Worktree owner");\n\t\t\t\tawait this.workspaces.archiveSession(sessionId, options);',
+    'managed Session archive from official menu and shortcuts',
+  )
+  replace(
+    '\t\t\t\tconst target = workspaceId ?? currentWorkspaceId ?? recent;\n\t\t\t\tif (target === void 0) {',
+    '\t\t\t\tconst target = workspaceId ?? currentWorkspaceId ?? recent;\n\t\t\t\tif (target !== void 0 && this.ctx.get("__dshGitWorktreeManagedGuard").blockWorkspace(target)) return;\n\t\t\t\tif (target === void 0) {',
+    'managed Workspace new Session shortcut',
+  )
+  replace(
+    '\t\t\tconst renameSession = async (sessionId, title) => {\n\t\t\t\tconst result = await sessions.using(',
+    '\t\t\tconst renameSession = async (sessionId, title) => {\n\t\t\t\tif (ctx.get("__dshGitWorktreeManagedGuard").blockSession(sessionId)) throw new Error("managed Session must be changed through its Worktree owner");\n\t\t\t\tconst result = await sessions.using(',
+    'managed Session rename dialog',
+  )
+  replace(
+    '\t\t\t\tupdatedAt: s.updatedAt,\n\t\t\t\t...pendingInteraction === void 0 ? {} : { pendingInteraction }',
+    '\t\t\t\tupdatedAt: s.updatedAt,\n\t\t\t\t__dshGitWorktree: s.__dshGitWorktree,\n\t\t\t\t...pendingInteraction === void 0 ? {} : { pendingInteraction }',
+    'managed Session metadata',
+  )
+  replace(
+    '\t\tfunction ProjectRowItem({ group, containsCurrentDescendant = false, onToggle, onCreate, actions, drag, home, newShortcut, t }) {\n\t\t\tconst row = group;',
+    '\t\tfunction ProjectRowItem({ group, containsCurrentDescendant = false, onToggle, onCreate, actions, drag, home, newShortcut, t }) {\n\t\t\tconst row = group;\n\t\t\tconst protectedManagedWorkspace = row.__dshGitWorktreeProtected === true;',
+    'managed Workspace row guard',
+  )
+  replace('\t\t\t\tdraggable: drag !== void 0,', '\t\t\t\tdraggable: drag !== void 0 && !protectedManagedWorkspace,', 'managed Workspace drag')
+  replace('\t\t\t\tonDragStart: drag === void 0 ? void 0 : (e) => {', '\t\t\t\tonDragStart: protectedManagedWorkspace || drag === void 0 ? void 0 : (e) => {', 'managed Workspace drag start')
+  replace('\t\t\t\t\t\tchildren: [actions !== void 0 && (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Menu, {', '\t\t\t\t\t\tchildren: [!protectedManagedWorkspace && actions !== void 0 && (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Menu, {', 'managed Workspace menu')
+  replace('\t\t\t\t\t\t}), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {\n\t\t\t\t\t\t\tlabel: t("actions.newSession"),', '\t\t\t\t\t\t}), !protectedManagedWorkspace && (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {\n\t\t\t\t\t\t\tlabel: t("actions.newSession"),', 'managed Workspace new Session')
+  replace(
+    '\t\tfunction SessionNodeItem({ node, currentId, now, onOpen, onRenameRequest, renderSlot, onReveal, drag, t }) {\n\t\t\tconst row = node;',
+    '\t\tfunction SessionNodeItem({ node, currentId, now, onOpen, onRenameRequest, renderSlot, onReveal, drag, t }) {\n\t\t\tconst row = node;\n\t\t\tconst protectedManagedSession = node.__dshGitWorktree?.kind === "managed-worktree";',
+    'managed Session row guard',
+  )
+  replace('\t\t\tconst draggable = drag !== void 0 && !row.blank && !row.archived;', '\t\t\tconst draggable = drag !== void 0 && !row.blank && !row.archived && !protectedManagedSession;', 'managed Session drag')
+  replace('\t\t\t\t\t\t\tonDoubleClick: row.blank ? void 0 : (e) => {', '\t\t\t\t\t\t\tonDoubleClick: row.blank || protectedManagedSession ? void 0 : (e) => {', 'managed Session rename')
+  // Keep the official hover container: the guarded Slot seats render only pin
+  // for managed Sessions, while ordinary Sessions retain every official action.
+  replace(
+    '\t\t\t\t\t\t(0, react_jsx_runtime.jsx)("span", {\n\t\t\t\t\t\t\tref: titleRef,\n\t\t\t\t\t\t\tclassName: Rows_module_css_default.title,',
+    '\t\t\t\t\t\tprotectedManagedSession && (0, react_jsx_runtime.jsx)("span", { title: node.__dshGitWorktree.label, "aria-label": node.__dshGitWorktree.label, style: { flexShrink: 0, display: "inline-flex" }, children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconBranchOutlineRegular, { size: 16 }) }),\n\t\t\t\t\t\t(0, react_jsx_runtime.jsx)("span", {\n\t\t\t\t\t\t\tref: titleRef,\n\t\t\t\t\t\t\tclassName: Rows_module_css_default.title,',
+    'managed Session branch decoration',
+  )
+  replace(
+    '\t\t\t\t\t\t\tchildren: title\n\t\t\t\t\t\t}),\n\t\t\t\t\t\t!row.blank && (0, react_jsx_runtime.jsx)("span", {\n\t\t\t\t\t\t\tclassName: Rows_module_css_default.time,',
+    '\t\t\t\t\t\t\tchildren: title\n\t\t\t\t\t\t}),\n\t\t\t\t\t\tprotectedManagedSession && (0, react_jsx_runtime.jsx)("span", { className: "dsh-git-worktree-sidebar-badge", "data-worktree-state": node.__dshGitWorktree.state, children: node.__dshGitWorktree.label }),\n\t\t\t\t\t\t!row.blank && (0, react_jsx_runtime.jsx)("span", {\n\t\t\t\t\t\t\tclassName: Rows_module_css_default.time,',
+    'managed Session status badge',
+  )
+  return derived
+}
+
+export function materializeNextWorkspaceClientModule() {
+  return materializeWorkspaceFactory(decorateNextWorkspaceClient(readNextWorkspaceClient()))
+}
+
+/** Load one pinned official Client factory without registering its upstream ModuleLoader row. */
+export function materializeWorkspaceFactory(source) {
+  const token = 'factory: (require) => {'
+  const start = source.indexOf(token)
+  const end = source.lastIndexOf('\n\t}\n});')
+  if (start < 0 || end < 0 || end <= start) throw new Error('Cannot extract official Workspace Client factory')
+  const body = source.slice(start + token.length, end)
+  return `
+import * as cordis from '@deepseek-ai/cordis'
+import * as store from '@deepseek-ai/dsh-client-store'
+import * as jsxRuntime from 'react/jsx-runtime'
+import * as react from 'react'
+import * as primitives from '@deepseek-ai/dsh-client-ui-primitives'
+const modules = {
+  '@deepseek-ai/cordis': cordis,
+  '@deepseek-ai/dsh-client-store': store,
+  'react/jsx-runtime': jsxRuntime,
+  'react': react,
+  '@deepseek-ai/dsh-client-ui-primitives': primitives,
+}
+const official = ((require) => {${body}
+})(specifier => {
+  const value = modules[specifier]
+  if (value === undefined) throw new Error('Unsupported official Workspace Client require: ' + specifier)
+  return value
+})
+export const apply = official.apply
+export const inject = official.inject
+`
+}

package/scripts/workspace-sidebar-upstream.d.mts

@@ -1,8 +1,8 @@
-export const WORKSPACE_UI_VERSION: string
-export const WORKSPACE_LOCALE_VERSION: string
-export const WORKSPACE_CLIENT_SHA256: string
-export const OFFICIAL_WORKSPACE_VIRTUAL_ID: string
-export const RESOLVED_OFFICIAL_WORKSPACE_VIRTUAL_ID: string
-export function readOfficialWorkspaceClient(): { source: string; clientPath: string }
-export function decorateOfficialWorkspaceClient(source: string): string
-export function materializeOfficialWorkspaceClientModule(): string
+export const WORKSPACE_UI_VERSION: string
+export const WORKSPACE_LOCALE_VERSION: string
+export const WORKSPACE_CLIENT_SHA256: string
+export const OFFICIAL_WORKSPACE_VIRTUAL_ID: string
+export const RESOLVED_OFFICIAL_WORKSPACE_VIRTUAL_ID: string
+export function readOfficialWorkspaceClient(): { source: string; clientPath: string }
+export function decorateOfficialWorkspaceClient(source: string): string
+export function materializeOfficialWorkspaceClientModule(): string