@mokuyoaxis/dsh-iris 0.2.6 → 0.2.7

package/lib/index.js

@@ -19,8 +19,8 @@ import { waitForModelWork } from './model-call-runtime.js';
 import { hasHostPort, requireHostPort } from './host-contract.js';
 import { createDshHostAdapter } from './dsh-host-adapter.js';
 import { withDshProviderConfig } from './dsh-provider-config.js';
-import { configureProviderHostForDsh } from './dsh-core-adapter.js';
-import { cropForDsh, diffForDsh, framesForDsh, summaryFramesForDsh, visionImageForDsh, htmlForDsh, inspectProviderTaskForDsh, projectCoreTaskForDsh, readCoreArtifactMediaForDsh, resumeProviderTaskWatchesForDsh, stopProviderTaskWatchesForDsh } from './dsh-core-adapter.js';
+import { createDshRuntime, dshCoreDataRoot } from './dsh-core-adapter.js';
+import { ModelPortError } from './model-port-contract.js';
 import { imageDimensions } from './pixels.js';
 import { runLocateRequest, runSummaryRequest, describeGeneratedImage } from './composite-vision-routing.js';
 import { normalizeSummarySource, summaryFrameRecords, summaryTimelineLabel } from './summary-input.js';
@@ -66,12 +66,11 @@ function outputDir() {
 
 /* ---------------- 媒体路由：/iris/media/:taskId/:token/:name ---------------- */
 
-let mediaRouteMounted = false;
-function mountIrisRoutes(routeCtx) {
+function mountIrisRoutes(routeCtx, core, routes) {
   // Cordis 服务只在 DSH 宿主边界探测；Command 与通用工具辅助函数不接收原始 ctx
   const host = dshHost(routeCtx);
   const reg = hasHostPort(host, 'routes') ? host.ports.routes : undefined;
-  if (!reg || typeof reg.register !== 'function' || mediaRouteMounted) return;
+  if (!reg || typeof reg.register !== 'function' || routes.mounted) return;
   try {
     const disposeMedia = reg.register({
       kind: 'prefix',
@@ -81,21 +80,21 @@ function mountIrisRoutes(routeCtx) {
     const disposeApi = reg.register({
       kind: 'prefix',
       path: '/iris/api',
-      handler: guarded((req, res) => serveApi(req, res, dshHost(routeCtx)))
+      handler: guarded((req, res) => serveApi(req, res, dshHost(routeCtx), core))
     });
     const disposeRender = reg.register({
       kind: 'prefix',
       path: '/iris/render',
       handler: guarded(serveRender)
     });
-    mediaRouteMounted = true;
+    routes.mounted = true;
     recordHostRoutes(EXPECTED_IRIS_ROUTES);
     routeCtx.effect(() => () => {
       if (typeof disposeMedia === 'function') disposeMedia();
       if (typeof disposeApi === 'function') disposeApi();
       if (typeof disposeRender === 'function') disposeRender();
       closeAllSse(); // SSE 长连接随插件停用一起关闭，不留悬挂连接
-      mediaRouteMounted = false;
+      routes.mounted = false;
     }, 'iris: media+api+actions+render routes');
     console.log('[iris] 媒体+工作台+操作路由已挂载：/iris/media · /iris/api · /iris/api/actions · /iris/render');
   } catch (err) {
@@ -181,11 +180,11 @@ function coreTaskTerminalProblem(task, label = '任务') {
   return label + '需要人工处理';
 }
 
-async function awaitCoreTerminal(taskId, { timeoutMs, signal }) {
+async function awaitCoreTerminal(core, taskId, { timeoutMs, signal }) {
   const deadline = Date.now() + timeoutMs;
   for (;;) {
     if (signal?.aborted) throw new Error('已取消；Core 任务仍保留远端受理事实，可稍后查询');
-    const task = await inspectProviderTaskForDsh(taskId, { signal });
+    const task = await core.inspectProviderTaskForDsh(taskId, { signal });
     if (coreTaskWaitFinished(task)) return task;
     if (Date.now() > deadline) return null;
     await new Promise((resolve) => setTimeout(resolve, 1000));
@@ -221,7 +220,14 @@ function safeRegister(host, definition) {
 
 export async function apply(ctx) {
   beginHostRuntime({ pluginId: IRIS_PLUGIN_ID, version: PACKAGE_VERSION });
-  const releaseProviderHost = configureProviderHostForDsh(() => dshHost(ctx));
+  const core = createDshRuntime({ dataRoot: dshCoreDataRoot(), getHost: () => dshHost(ctx) });
+  ctx.provide('irisRuntime', core);
+  const routes = { mounted: false };
+  const { cropForDsh, diffForDsh, framesForDsh, summaryFramesForDsh, visionImageForDsh, htmlForDsh, inspectProviderTaskForDsh, projectCoreTaskForDsh, readCoreArtifactMediaForDsh, resumeProviderTaskWatchesForDsh } = core;
+  ctx.effect(() => () => {
+    tasks.stopWatchAll();
+    return core.dispose();
+  }, 'iris: DSH runtime');
   guard('Iris 私有存储权限收紧', () => hardenPrivateTree(store.irisHome()));
 
   guard('上传临时文件清理', () => purgeStaleUploads());
@@ -245,27 +251,18 @@ export async function apply(ctx) {
     if (resumed.length) console.log(`[iris] 已恢复接管 ${resumed.length} 个后台任务`);
   });
 
-  try {
-    const resumed = await resumeProviderTaskWatchesForDsh();
-    if (resumed.length) console.log(`[iris] 已恢复接管 ${resumed.length} 个 Core 图片任务`);
-  } catch (error) {
-    console.error('[iris] 恢复 Core 图片后台任务失败（已隔离，不影响宿主）:', error?.message || error);
-  }
-
-  // Fiber 清理：插件停用/更新时停掉 legacy 与 Core 的全部 Host 盯守句柄
-  guard('盯守句柄注册', () => {
-    ctx.effect(() => () => {
-      tasks.stopWatchAll();
-      stopProviderTaskWatchesForDsh();
-      releaseProviderHost();
-    });
+  // Owned background setup lets unload cancel a slow connection resolver during takeover.
+  void resumeProviderTaskWatchesForDsh().then(resumed => {
+    if (resumed.length) console.log('[iris] 已恢复接管 ' + resumed.length + ' 个 Core 媒体任务');
+  }, error => {
+    if (core.snapshot().state === 'open') console.error('[iris] 恢复 Core 后台任务失败:', error?.code || 'unknown');
   });
 
   // 媒体路由（视频/音频在对话流里的可播通路；图片仍走原生附件）
-  ctx.inject(['webServer'], mountIrisRoutes);
-  ctx.inject(['httpServer'], mountIrisRoutes);
+  ctx.inject(['webServer'], routeCtx => mountIrisRoutes(routeCtx, core, routes));
+  ctx.inject(['httpServer'], routeCtx => mountIrisRoutes(routeCtx, core, routes));
   // 若 webServer 已在运行，inject 回调也会触发；这里兜底立即挂载一次
-  guard('媒体路由兜底挂载', () => mountIrisRoutes(ctx));
+  guard('媒体路由兜底挂载', () => mountIrisRoutes(ctx, core, routes));
 
   // DSH 的 Skill registry 是可选宿主能力。存在时把 npm 包内三项 Skill 注册到
   // 全局层；项目目录中的同名 Skill 仍由 DSH 原生优先级覆盖。
@@ -283,13 +280,22 @@ export async function apply(ctx) {
     'iris_media_summarize', 'iris_locate', 'iris_long_ocr']);
   const visionTools = new Set(['iris_look_at_image', 'iris_relook_attachment', 'iris_media_summarize', 'iris_locate', 'iris_long_ocr']);
   function registerIrisTool(definition) {
-    safeRegister(host, { ...definition, execute(args, exec) {
-      const execute = async () => {
-        if (visionTools.has(definition.name) && !args?.model) await store.refreshAutomaticDirectories({ capability: 'vision', signal: exec.signal });
-        return definition.execute(args, exec);
-      };
-      return providerTools.has(definition.name)
-        ? withDshProviderConfig(dshHost(ctx), execute, { signal: exec.signal }) : execute();
+    safeRegister(host, { ...definition, execute(args, exec = {}) {
+      const owned = structuredClone(args || {});
+      return core.runHostOperation(signal => {
+        const execute = async () => {
+          if (visionTools.has(definition.name) && !owned.model) await store.refreshAutomaticDirectories({ capability: 'vision', signal });
+          signal.throwIfAborted();
+          return definition.execute(owned, { ...exec, signal });
+        };
+        return providerTools.has(definition.name)
+          ? withDshProviderConfig(dshHost(ctx), execute, { signal }) : execute();
+      }, { signal: exec.signal }).catch(error => {
+        if (visionTools.has(definition.name) && exec.signal?.aborted && error === exec.signal.reason) {
+          throw new ModelPortError('IRIS_MODEL_ABORTED');
+        }
+        throw error;
+      });
     } });
   }
   if (!hasHostPort(host, 'tools')) {
@@ -299,7 +305,7 @@ export async function apply(ctx) {
 
   async function coreImageToolResult(submitted, prompt, signal) {
     let final = await inspectProviderTaskForDsh(submitted.taskId, { signal });
-    if (!coreTaskWaitFinished(final)) final = await awaitCoreTerminal(submitted.taskId, { timeoutMs: AWAIT_MS.image, signal });
+    if (!coreTaskWaitFinished(final)) final = await awaitCoreTerminal(core, submitted.taskId, { timeoutMs: AWAIT_MS.image, signal });
     if (!final) return { blocks: [{ type: 'text', text: `[iris] Core 图片任务仍在后台观察（task: ${submitted.taskId}）。稍后可用 iris_task_status 查询进度与 Artifact。` }] };
     const terminalProblem = coreTaskTerminalProblem(final, '图像生成');
     if (terminalProblem) throw new Error(terminalProblem);
@@ -345,9 +351,9 @@ export async function apply(ctx) {
       const attachmentId = String(args.attachment_id || '').trim();
       if (Boolean(imagePath) === Boolean(attachmentId)) throw new Error('图片导入须选择image_path或attachment_id之一');
       const input = imagePath ? { image_path: imagePath } : {
-        image_bytes: (await resolveVisionImageInput(dshHost(ctx), exec, { attachment_id: attachmentId }, exec.signal)).bytes
+        image_bytes: (await resolveVisionImageInput(core, dshHost(ctx), exec, { attachment_id: attachmentId }, exec.signal)).bytes
       };
-      return runAction(dshHost(ctx), 'image_import', input, { signal: exec.signal });
+      return runAction(dshHost(ctx), 'image_import', input, { signal: exec.signal, core });
     }
   });
 
@@ -374,7 +380,7 @@ export async function apply(ctx) {
     isConcurrencySafe: () => false,
     async execute(args, exec) {
       const prompt = String(args.prompt || '').trim();
-      const submitted = await runAction(dshHost(ctx), 'image', args, { signal: exec.signal });
+      const submitted = await runAction(dshHost(ctx), 'image', args, { signal: exec.signal, core });
       if (submitted.storage === 'core') {
         return coreImageToolResult(submitted, prompt, exec.signal);
       }
@@ -437,7 +443,7 @@ export async function apply(ctx) {
     output: { schema: { type: 'object' }, render: (_args, value) => value.blocks },
     isConcurrencySafe: () => false,
     async execute(args, exec) {
-      const submitted = await runAction(dshHost(ctx), 'image_edit', args, { signal: exec.signal });
+      const submitted = await runAction(dshHost(ctx), 'image_edit', args, { signal: exec.signal, core });
       return coreImageToolResult(submitted, String(args.prompt || '').trim(), exec.signal);
     }
   });
@@ -468,11 +474,11 @@ export async function apply(ctx) {
     output: { schema: { type: 'string' }, render: (_args, v) => [{ type: 'text', text: v }] },
     isConcurrencySafe: () => false,
     async execute(args, exec) {
-      const submitted = await runAction(dshHost(ctx), 'video', { ...args, session_id: exec.agent?.session?.id }, { signal: exec.signal });
+      const submitted = await runAction(dshHost(ctx), 'video', { ...args, session_id: exec.agent?.session?.id }, { signal: exec.signal, core });
       if (submitted.storage === 'core') {
         let final = await inspectProviderTaskForDsh(submitted.taskId, { signal: exec.signal });
         if (!coreTaskWaitFinished(final)) {
-          final = await awaitCoreTerminal(submitted.taskId, { timeoutMs: AWAIT_MS.video, signal: exec.signal });
+          final = await awaitCoreTerminal(core, submitted.taskId, { timeoutMs: AWAIT_MS.video, signal: exec.signal });
         }
         if (!final) {
           return `[iris] Core 视频任务已提交并转入后台观察（task: ${submitted.taskId}，remoteTask: ${submitted.remoteTaskId}）。\n` +
@@ -518,7 +524,7 @@ export async function apply(ctx) {
     output: { schema: { type: 'string' }, render: (_args, value) => [{ type: 'text', text: value }] },
     isConcurrencySafe: () => true,
     async execute(args, exec) {
-      const submitted = await runAction(dshHost(ctx), 'music', args, { signal: exec.signal });
+      const submitted = await runAction(dshHost(ctx), 'music', args, { signal: exec.signal, core });
       return submitted.text + '\nartifact: ' + submitted.artifactIds.join(', ') + '\n' +
         submitted.artifactIds.map(id => '[♪ 音乐播放](/iris/api/core/artifact/' + encodeURIComponent(id) + '/media)').join('\n');
     }
@@ -540,7 +546,7 @@ export async function apply(ctx) {
     output: { schema: { type: 'string' }, render: (_args, v) => [{ type: 'text', text: v }] },
     isConcurrencySafe: () => true,
     async execute(args, exec) {
-      const submitted = await runAction(dshHost(ctx), 'tts', args, { signal: exec.signal });
+      const submitted = await runAction(dshHost(ctx), 'tts', args, { signal: exec.signal, core });
       if (submitted.storage === 'core') {
         const final = await inspectProviderTaskForDsh(submitted.taskId, { signal: exec.signal });
         const terminalProblem = coreTaskTerminalProblem(final, '语音合成');
@@ -577,11 +583,11 @@ export async function apply(ctx) {
     output: { schema: { type: 'string' }, render: (_args, v) => [{ type: 'text', text: v }] },
     isConcurrencySafe: () => false,
     async execute(args, exec) {
-      const submitted = await runAction(dshHost(ctx), 'transcribe', args, { signal: exec.signal });
+      const submitted = await runAction(dshHost(ctx), 'transcribe', args, { signal: exec.signal, core });
       if (submitted.storage === 'core') {
         let final = await inspectProviderTaskForDsh(submitted.taskId, { signal: exec.signal });
         if (!coreTaskWaitFinished(final)) {
-          final = await awaitCoreTerminal(submitted.taskId, { timeoutMs: AWAIT_MS.transcribe, signal: exec.signal });
+          final = await awaitCoreTerminal(core, submitted.taskId, { timeoutMs: AWAIT_MS.transcribe, signal: exec.signal });
         }
         if (!final) {
           return `[iris] Core 转写任务已提交并转入后台观察（task: ${submitted.taskId}）。完成后用 iris_task_status 查询进度与 Artifact。`;
@@ -714,8 +720,8 @@ export async function apply(ctx) {
               try {
                 const audio = await extractAudioTrack({ inputPath: p, signal });
                 try {
-                  const submitted = await runAction(dshHost(ctx), 'transcribe', { audio_path: audio.filePath }, { signal });
-                  const final = await awaitCoreTerminal(submitted.taskId, { timeoutMs: 120000, signal });
+                  const submitted = await runAction(dshHost(ctx), 'transcribe', { audio_path: audio.filePath }, { signal, core });
+                  const final = await awaitCoreTerminal(core, submitted.taskId, { timeoutMs: 120000, signal });
                   if (final?.outcome === 'succeeded' && final.deliveryState === 'ready') {
                     const texts = [];
                     for (const artifactId of final.artifactIds) {
@@ -852,7 +858,7 @@ export async function apply(ctx) {
     output: { schema: { type: 'string' }, render: (_args, v) => [{ type: 'text', text: v }] },
     isConcurrencySafe: () => true,
     async execute(args) {
-      const result = await runAction(dshHost(ctx), 'status', args || {});
+      const result = await runAction(dshHost(ctx), 'status', args || {}, { core });
       return result.text;
     }
   });
@@ -985,7 +991,7 @@ export async function apply(ctx) {
     async execute(args, exec) {
       const r = await runLocateRequest(dshHost(ctx), {
         providers: store.pickAllFor(cap.CAPABILITIES.VISION), onRateLimit: store.recordRateLimit, onModelAvailability: store.recordAvailability, model: args.model, target: args.target,
-        prepareImage: signal => resolveVisionImageInput(dshHost(ctx), exec, args, signal), signal: exec.signal
+        prepareImage: signal => resolveVisionImageInput(core, dshHost(ctx), exec, args, signal), signal: exec.signal
       });
       const { width, height } = r;
       const sourceNote = args.artifact_id ? `\nCore Artifact: ${args.artifact_id}` : '';
@@ -1074,7 +1080,7 @@ export async function apply(ctx) {
       const host = dshHost(ctx);
       const result = await runOcrRequest(host, {
         providers: store.pickAllFor(cap.CAPABILITIES.VISION), onRateLimit: store.recordRateLimit, onModelAvailability: store.recordAvailability,
-        prepareImage: operationSignal => resolveVisionImageInput(host, exec, args, operationSignal),
+        prepareImage: operationSignal => resolveVisionImageInput(core, host, exec, args, operationSignal),
         chunkHeight: args.chunk_height,
         overlap: args.overlap,
         signal: exec.signal
@@ -1133,10 +1139,10 @@ async function resolveImageInput(host, exec, { image_path, attachment_id }) {
 }
 
 /** 视觉解引用在整体预算内；路径限额读，Host 会话/附件等待可取消。 */
-async function resolveVisionImageInput(host, exec, input, signal) {
+async function resolveVisionImageInput(core, host, exec, input, signal) {
   const source = normalizeVisionImageSource(input, { allowAttachment: true });
   const { image_path, artifact_id, attachment_id } = input;
-  if (source === 'artifact_id') return visionImageForDsh({ artifactId: artifact_id, signal });
+  if (source === 'artifact_id') return core.visionImageForDsh({ artifactId: artifact_id, signal });
   if (image_path) {
     const file = String(image_path).trim();
     const mediaType = MEDIA_TYPES[path.extname(file).toLowerCase()];

package/lib/local-api-projection.js

@@ -0,0 +1,27 @@
+// HTTP DTOs whitelist existing Core facts; never expose records or configuration wholesale.
+const STATUSES = new Set(['not_started', 'running', 'needs_attention', 'delivery_failed',
+  'needs_comparison', 'awaiting_selection', 'selected']);
+
+export function projectLocalApiFlow(facts) {
+  if (facts.contractVersion !== 0 || facts.run.recipe !== 'image-edit/v0' || !STATUSES.has(facts.status)) {
+    throw new TypeError('不支持的流程契约或状态');
+  }
+  const { run, task } = facts;
+  const ref = value => value ? { artifactId: value.artifactId } : null;
+  return {
+    contractVersion: 0, id: run.id, recipe: run.recipe, revision: run.revision,
+    createdAt: run.createdAt, updatedAt: run.updatedAt, status: facts.status,
+    input: { prompt: run.input.prompt, modelRef: run.input.model_ref,
+      ...(run.input.size !== undefined ? { size: run.input.size } : {}) },
+    source: ref(run.source), output: ref(run.output), comparison: ref(run.comparison), selection: ref(run.selection),
+    task: task ? { id: task.id, acceptance: task.acceptance, outcome: task.outcome,
+      deliveryState: task.deliveryState, attemptCount: task.attempts.length } : null,
+    metrics: facts.metrics ? Object.fromEntries(['ratio', 'diffPixels', 'totalPixels', 'width', 'height']
+      .map(key => [key, facts.metrics[key]])) : null
+  };
+}
+
+export function projectLocalApiRunSummary(run) {
+  return { id: run.id, recipe: run.recipe, createdAt: run.createdAt,
+    modelRef: run.modelRef, source: { artifactId: run.source.artifactId } };
+}