dsh-plugin-admin 0.4.3 → 0.5.1

package/lib/index.js

@@ -16,6 +16,10 @@
  *    - unarchive(sessionId) → remove from the registry's archived set
  *    - deleteSession(sessionId) → rm the session log directory, detach workspace
  *      accounting, and clear any archived-set entry
+ *
+ * 3. Namespace `subagentAdmin` (merged from the former dsh-plugin-subagents
+ *    plugin — see lib/subagent-admin.js): named delegation-tool instances and
+ *    their external CLI backends, managed as profile cordis.patch.yml rows.
  */
 
 import { spawn, spawnSync } from 'node:child_process'
@@ -26,9 +30,10 @@ import { basename, dirname, join } from 'node:path'
 import { homedir } from 'node:os'
 import { fileURLToPath } from 'node:url'
 import { setTimeout as sleep } from 'node:timers/promises'
+import { applySubagentAdmin } from './subagent-admin.js'
 
 /** Services required before this plugin mounts. */
-export const inject = ['typert', 'workspaceRegistry', 'sessionPersistence']
+export const inject = ['typert', 'workspaceRegistry', 'sessionPersistence', 'tools', 'subagents']
 
 const PLUGIN_SERVICE_KEY = 'pluginAdmin'
 const PLUGIN_NAMESPACE = 'pluginAdmin'
@@ -187,6 +192,27 @@ function resolveNpmRegistry(profileDir) {
   return NPM_REGISTRY_DEFAULT
 }
 
+/**
+ * Resolve a `name@latest` install spec into a pinned `name@<version>` spec by
+ * querying the registry for the current `latest` dist-tag. Returns the original
+ * `name@latest` unchanged when the registry is unreachable, so an offline
+ * upgrade attempt still fails loudly (pnpm will error on the unknown tag)
+ * rather than silently no-op'ing. Scoped names (`@scope/name`) are supported.
+ * @param profileDir - profile directory (used to locate a local .npmrc).
+ * @param name - package name without any version/range suffix.
+ * @returns the pinned spec string (e.g. "dsh-plugin-admin@0.5.0").
+ */
+async function resolveLatestSpec(profileDir, name) {
+  const registry = resolveNpmRegistry(profileDir)
+  const latest = await fetchLatestVersion(registry, name)
+  if (latest === null) {
+    // Registry unreachable: keep the literal @latest so pnpm surfaces the
+    // failure (no silent "up to date").
+    return name + '@latest'
+  }
+  return name + '@' + latest
+}
+
 /**
  * Query the npm registry for the `latest` dist-tag version of one package.
  * Strict timeout; returns null on any failure so a dead registry never
@@ -1185,7 +1211,19 @@ export function apply(ctx) {
       if (typeof spec !== 'string' || spec.trim() === '') {
         throw new Error('plugin-admin: install requires a spec string')
       }
-      const operand = assertPnpmOperand('install spec', spec)
+      const rawOperand = assertPnpmOperand('install spec', spec)
+      // A bare `@latest` dist-tag is ambiguous for pnpm when the manifest
+      // already pins a satisified range (e.g. "^0.4.2"): pnpm resolves
+      // @latest against the range, concludes "Already up to date", and exits
+      // 0 WITHOUT fetching the newer published version — the upgrade silently
+      // no-ops. Resolve the real latest version from the registry first and
+      // pin it exactly so pnpm is forced to bump the constraint and download.
+      // The client already sends an exact `name@<version>` when it knows the
+      // latest (from checkUpdates); this is the server-side safety net for
+      // any caller that still passes `@latest`.
+      const operand = rawOperand.endsWith('@latest')
+        ? await resolveLatestSpec(profileDir, rawOperand.slice(0, -'@latest'.length))
+        : rawOperand
       return enqueue(async () => {
         const output = await runPnpm(profileDir, ['add', operand])
         reconcileBundles(profileDir)
@@ -2010,6 +2048,14 @@ export function apply(ctx) {
   Object.defineProperty(mcpService, 'typertRemote', { value: mcpBinding, enumerable: false })
   ctx.provide(MCP_SERVICE_KEY, mcpService)
 
+  /* ---------------------- Subagent Admin (merged) -------------------------- */
+  // Mount the subagentAdmin remote (formerly the standalone dsh-plugin-subagents
+  // plugin). It shares this apply's serial queue: mcpAdmin and subagentAdmin
+  // both read-modify-write the profile's cordis.patch.yml. The typert registry
+  // allows ONE registration per package name, so the subagent invocations ride
+  // the unified descriptor below instead of registering their own.
+  const subagentInvocations = applySubagentAdmin(ctx, enqueue)
+
   /* ---------------------- Typert Descriptors Register ---------------------- */
   const specParam = [{ name: 'spec', wire: 'spec', source: 'json', codec: { mode: 'src-json' } }]
   const nameParam = [{ name: 'name', wire: 'name', source: 'json', codec: { mode: 'src-json' } }]
@@ -2152,6 +2198,8 @@ export function apply(ctx) {
         parameters: [{ name: 'id', wire: 'id', source: 'json', codec: { mode: 'src-json' } }],
         result: { mode: 'src-json' },
       },
+      // subagentAdmin (merged from dsh-plugin-subagents)
+      ...subagentInvocations,
     ],
-  }), 'plugin-admin: typert descriptors (plugins, sessions, fs, mcp)')
+  }), 'plugin-admin: typert descriptors (plugins, sessions, fs, mcp, subagents)')
 }