dsh-git-worktree 0.7.1 → 0.7.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-git-worktree",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "Experimental Git worktree Session Targets for DeepSeek Harness with isolated sessions, review checkpoints, human-confirmed delivery, and safe recovery.",
   "type": "module",
   "main": "lib/index.js",
@@ -43,7 +43,8 @@
     },
     "client": {
       "inject": [
-        "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-api-session-controller",
+        "@deepseek-ai/dsh-api-workspace-controller",
         "@deepseek-ai/dsh-client-connection",
         "@deepseek-ai/dsh-client-locale",
         "@deepseek-ai/dsh-client-ui-conversation",
@@ -79,29 +80,41 @@
     "prepublishOnly": "pnpm run check:sidebar-version && pnpm run build && pnpm run check:publish:release && pnpm run test"
   },
   "dependencies": {
-    "@deepseek-ai/cordis": "4.0.1",
-    "@deepseek-ai/dsh-agent": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-commands": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-session": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-subprocess": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-system-prompt": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-tools": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-typert-protocol": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-typert-registry": "0.1.1-rc.2",
-    "@deepseek-ai/schemastery": "3.18.1",
+    "@deepseek-ai/schemastery": "3.18.2",
     "zod": "4.4.3"
   },
   "peerDependencies": {
-    "@deepseek-ai/dsh-client-locale": "0.1.1-rc.2",
+    "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/dsh-agent": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-locale": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-commands": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-session": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-subprocess": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-system-prompt": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-tools": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-typert-protocol": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-typert-registry": "^0.1.2-rc.1",
     "react": "^18.2.0"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-api-gateway": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-connection": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-locale": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-runtime": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-workspace": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-typert-loader": "0.1.1-rc.2",
+    "@deepseek-ai/cordis": "4.0.2",
+    "@deepseek-ai/dsh-agent": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-api-gateway": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-api-session-controller": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-api-workspace-controller": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-connection": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-locale": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-store": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-workspace": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-commands": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-session": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-subprocess": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-system-prompt": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-tools": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-typert-loader": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-typert-protocol": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-typert-registry": "0.1.2-rc.1",
     "@testing-library/react": "^16.3.2",
     "@types/node": "^22.0.0",
     "@types/react": "~18.3.31",

package/scripts/check-publish.mjs

@@ -35,7 +35,32 @@ function includedByFiles(target) {
   })
 }
 
-// 1. Host bundle declaration and patch.
+// 1. Host singleton packages must resolve from DSH instead of a plugin-private dependency tree.
+const hostSingletonPackages = [
+  '@deepseek-ai/cordis',
+  '@deepseek-ai/dsh-agent',
+  '@deepseek-ai/dsh-commands',
+  '@deepseek-ai/dsh-session',
+  '@deepseek-ai/dsh-subprocess',
+  '@deepseek-ai/dsh-system-prompt',
+  '@deepseek-ai/dsh-tools',
+  '@deepseek-ai/dsh-typert-protocol',
+  '@deepseek-ai/dsh-typert-registry',
+]
+for (const packageName of hostSingletonPackages) {
+  if (manifest.dependencies?.[packageName] !== undefined) {
+    fail(`${packageName} must be a peerDependency; a private copy breaks Host service identity`)
+  }
+  if (typeof manifest.peerDependencies?.[packageName] !== 'string') {
+    fail(`${packageName} is missing from peerDependencies`)
+  }
+  if (typeof manifest.devDependencies?.[packageName] !== 'string') {
+    fail(`${packageName} is missing from devDependencies`)
+  }
+}
+ok(`${hostSingletonPackages.length} Host singleton packages are peer-provided and locally testable`)
+
+// 2. Host bundle declaration and patch.
 const patchRel = manifest.dsh?.bundle?.patch
 if (typeof patchRel !== 'string' || patchRel.length === 0) {
   fail('package.json lacks "dsh".bundle.patch — dsh plugin add would install a plain dependency without mounting it')
@@ -58,7 +83,7 @@ if (!manifest.files?.includes('NOTICE') || !existsSync(resolve(root, 'NOTICE')))
 }
 ok(`Host mount patch ${patchRel} replaces official ui-workspace with one gated derivative`)
 
-// 2. Every package export must exist and be included in the tarball.
+// 3. Every package export must exist and be included in the tarball.
 const exportsMap = manifest.exports
 if (!exportsMap || typeof exportsMap !== 'object' || Array.isArray(exportsMap)) fail('package.json lacks an exports map')
 let exportCount = 0
@@ -83,7 +108,7 @@ for (const stale of [
 }
 ok('removed Diff UI has no stale publish artifact')
 
-// 3. Manual strict Typert artifacts: one descriptor identity feeds Host Loader and Client mount.
+// 4. Manual strict Typert artifacts: one descriptor identity feeds Host Loader and Client mount.
 if (manifest.dependencies?.['@deepseek-ai/dsh-typert-generator'] || manifest.devDependencies?.['@deepseek-ai/dsh-typert-generator']) {
   fail('manual contribution package must not depend on @deepseek-ai/dsh-typert-generator')
 }
@@ -116,7 +141,7 @@ for (const descriptor of hostContribution.invocations) {
 }
 ok(`manual strict ./typert + ./remote contribution (${expectedRemoteMethods.length} methods)`)
 
-// 4. Host entry metadata required by the Cordis loader.
+// 5. Host entry metadata required by the Cordis loader.
 const entryRel = exportsMap['.']?.default ?? manifest.main
 if (typeof entryRel !== 'string') fail('exports["."].default is not a path')
 const entry = readFileSync(resolve(root, entryRel), 'utf8')
@@ -124,13 +149,14 @@ if (!/export\s+function\s+apply\b/.test(entry)) fail(`${entryRel} does not expor
 if (!/export\s+const\s+inject\b/.test(entry)) fail(`${entryRel} does not export const inject`)
 ok(`${entryRel} exports Host apply + inject`)
 
-// 5. Browser ToolView declaration and executable ModuleLoader closure.
+// 6. Browser ToolView declaration and executable ModuleLoader closure.
 const client = manifest.dsh?.client
 if (!client || client.platform !== 'web' || !Array.isArray(client.inject) || client.inject.length === 0) {
   fail('package.json must declare dsh.client { platform: "web", inject: [...] }')
 }
 const requiredClientPackages = [
-  '@deepseek-ai/dsh-client-runtime',
+  '@deepseek-ai/dsh-api-session-controller',
+  '@deepseek-ai/dsh-api-workspace-controller',
   '@deepseek-ai/dsh-client-ui-conversation',
   '@deepseek-ai/dsh-api-gateway',
 ]
@@ -146,7 +172,8 @@ const allowedBrowserRequires = new Set([
   'react',
   'react/jsx-runtime',
   '@deepseek-ai/dsh-client-ui-primitives',
-  '@deepseek-ai/dsh-client-runtime/client',
+  '@deepseek-ai/cordis',
+  '@deepseek-ai/dsh-client-store',
 ])
 const unsupportedBrowserRequires = browserRequires.filter(specifier => !allowedBrowserRequires.has(specifier))
 if (unsupportedBrowserRequires.length > 0) {
@@ -172,11 +199,6 @@ if (!handoff || handoff.id !== manifest.name || typeof handoff.factory !== 'func
 }
 const browserRequire = (specifier) => {
   if (specifier === '@deepseek-ai/dsh-client-ui-primitives') return { Modal: () => null, Menu: () => null }
-  if (specifier === '@deepseek-ai/dsh-client-runtime/client') return {
-    defineStore: spec => ({ spec, create: () => ({ actions: {} }) }),
-    indexSubagentDescendants: () => new Map(),
-    abbreviateHomePath: path => path,
-  }
   return require(specifier)
 }
 let clientExports
@@ -192,7 +214,7 @@ if (!clientExports.inject.includes('remote')) fail('client bundle must inject th
 if (!clientExports.inject.includes('conversation')) fail('client bundle must inject the public conversation service for pre-session draft transfer')
 ok(`${clientRel} registers ${manifest.name} through the browser ModuleLoader contract`)
 
-// 6. Release CI and npm's prepublish lifecycle require committed source identity;
+// 7. Release CI and npm's prepublish lifecycle require committed source identity;
 // local review builds intentionally run against a dirty managed Worktree.
 const requireClean = process.env.CHECK_PUBLISH_REQUIRE_CLEAN === '1'
   || process.argv.includes('--require-clean')

package/scripts/workspace-sidebar-upstream.mjs

@@ -2,9 +2,9 @@ import { createHash } from 'node:crypto'
 import { readFileSync } from 'node:fs'
 import { createRequire } from 'node:module'
 
-export const WORKSPACE_UI_VERSION = '0.1.1-rc.2'
-export const WORKSPACE_LOCALE_VERSION = '0.1.1-rc.2'
-export const WORKSPACE_CLIENT_SHA256 = '75d8a09a43a820e0ff8470e7b9c87b6dced523764ee650a8382317f6ef7a314b'
+export const WORKSPACE_UI_VERSION = '0.1.2-rc.1'
+export const WORKSPACE_LOCALE_VERSION = '0.1.2-rc.1'
+export const WORKSPACE_CLIENT_SHA256 = '53c40660195c42cde709b802e239f473dd721f45bc329684af31c01fdb73282a'
 export const OFFICIAL_WORKSPACE_VIRTUAL_ID = 'virtual:dsh-official-workspace-client'
 export const RESOLVED_OFFICIAL_WORKSPACE_VIRTUAL_ID = `\0${OFFICIAL_WORKSPACE_VIRTUAL_ID}`
 
@@ -53,12 +53,12 @@ export function decorateOfficialWorkspaceClient(source) {
     '\t\t\t\tconst group = buildGroup(workspace.workspaceId, workspace.workspaceId, workspace.path, Date.parse(workspace.createdAt), workspace.title, members, "account");\n\t\t\t\tif (workspace.__dshGitWorktreeProtected === true) group.__dshGitWorktreeProtected = true;\n\t\t\t\tgroups.push(group);',
     'Managed workspace metadata')
   derived = replaceExactlyOnce(derived,
-    '\t\t\t\tupdatedAt: s.updatedAt,\n\t\t\t\t...s.pendingInteraction === void 0 ? {} : { pendingInteraction: s.pendingInteraction }',
-    '\t\t\t\tupdatedAt: s.updatedAt,\n\t\t\t\t...s.__dshGitWorktree === void 0 ? {} : { __dshGitWorktree: s.__dshGitWorktree },\n\t\t\t\t...s.pendingInteraction === void 0 ? {} : { pendingInteraction: s.pendingInteraction }',
+    '\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...s.__dshGitWorktree === void 0 ? {} : { __dshGitWorktree: s.__dshGitWorktree },\n\t\t\t\t...pendingInteraction === void 0 ? {} : { pendingInteraction }',
     'session node metadata')
   derived = replaceExactlyOnce(derived,
-    '\t\t\t\t\t\trunningSubagentCount: descendants.get(summary.id)?.runningCount ?? 0,\n\t\t\t\t\t\t...summary.pendingInteraction === void 0 ? {} : { pendingInteraction: summary.pendingInteraction },',
-    '\t\t\t\t\t\trunningSubagentCount: descendants.get(summary.id)?.runningCount ?? 0,\n\t\t\t\t\t\t...summary.__dshGitWorktree === void 0 ? {} : { __dshGitWorktree: summary.__dshGitWorktree },\n\t\t\t\t\t\t...summary.pendingInteraction === void 0 ? {} : { pendingInteraction: summary.pendingInteraction },',
+    '\t\t\t\t\t\trunningSubagentCount: descendants.get(summary.id)?.runningCount ?? 0,\n\t\t\t\t\t\t...pendingInteraction === void 0 ? {} : { pendingInteraction },',
+    '\t\t\t\t\t\trunningSubagentCount: descendants.get(summary.id)?.runningCount ?? 0,\n\t\t\t\t\t\t...summary.__dshGitWorktree === void 0 ? {} : { __dshGitWorktree: summary.__dshGitWorktree },\n\t\t\t\t\t\t...pendingInteraction === void 0 ? {} : { pendingInteraction },',
     'search result metadata')
   derived = replaceExactlyOnce(derived,
     '\t\t\t\t\tlabel: g.label,\n\t\t\t\t\tsessionCount: g.sessions.length,',
@@ -81,8 +81,8 @@ export function decorateOfficialWorkspaceClient(source) {
     '\t\t\tconst primaryStatus = statuses[0];\n\t\t\tconst worktreeDecoration = managedWorktreeDecoration(result, t);\n\t\t\treturn (0, react_jsx_runtime.jsxs)("button", {\n\t\t\t\ttype: "button",\n\t\t\t\tclassName: clsx(Rows_module_css_default.searchResultRow, selected && Rows_module_css_default.selected),\n\t\t\t\t...worktreeDecoration === void 0 ? {} : { "aria-label": worktreeDecoration.ariaLabel, "data-managed-worktree": "true" },',
     'search Worktree identity')
   derived = replaceExactlyOnce(derived,
-    '\t\t\t\t\t\tchildren: (primaryStatus.state !== "done" || result.completed) && (0, react_jsx_runtime.jsx)(SessionStatusDots, { statuses })\n\t\t\t\t\t}), (0, react_jsx_runtime.jsx)("span", {\n\t\t\t\t\t\tclassName: Rows_module_css_default.searchResultTitle,',
-    '\t\t\t\t\t\tchildren: (primaryStatus.state !== "done" || result.completed) && (0, react_jsx_runtime.jsx)(SessionStatusDots, { statuses })\n\t\t\t\t\t}), worktreeDecoration !== void 0 && (0, react_jsx_runtime.jsx)(ManagedWorktreeIdentity, { decoration: worktreeDecoration }), (0, react_jsx_runtime.jsx)("span", {\n\t\t\t\t\t\tclassName: Rows_module_css_default.searchResultTitle,',
+    '\t\t\t\t\t\t\tchildren: (primaryStatus.state !== "done" || result.completed) && (0, react_jsx_runtime.jsx)(SessionStatusDots, { statuses })\n\t\t\t\t\t\t}),\n\t\t\t\t\t\t(0, react_jsx_runtime.jsx)("span", {\n\t\t\t\t\t\t\tclassName: Rows_module_css_default.searchResultTitle,',
+    '\t\t\t\t\t\t\tchildren: (primaryStatus.state !== "done" || result.completed) && (0, react_jsx_runtime.jsx)(SessionStatusDots, { statuses })\n\t\t\t\t\t\t}),\n\t\t\t\t\t\tworktreeDecoration !== void 0 && (0, react_jsx_runtime.jsx)(ManagedWorktreeIdentity, { decoration: worktreeDecoration }),\n\t\t\t\t\t\t(0, react_jsx_runtime.jsx)("span", {\n\t\t\t\t\t\t\tclassName: Rows_module_css_default.searchResultTitle,',
     'search Worktree decoration')
   derived = replaceExactlyOnce(derived,
     '\t\t\tconst label = row.workspaceId === void 0 ? t("group.ungrouped") : row.label;\n\t\t\tconst active = group.expanded && group.containsCurrent;',
@@ -138,12 +138,14 @@ export function materializeOfficialWorkspaceClientModule() {
   }
   const body = source.slice(start + factoryToken.length, end)
   return `
-import * as runtime from '@deepseek-ai/dsh-client-runtime/client'
+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/dsh-client-runtime/client': runtime,
+  '@deepseek-ai/cordis': cordis,
+  '@deepseek-ai/dsh-client-store': store,
   'react/jsx-runtime': jsxRuntime,
   'react': react,
   '@deepseek-ai/dsh-client-ui-primitives': primitives,