@mokuyoaxis/dsh-iris 0.1.4 → 0.2.0

package/lib/adapters.js

@@ -9,7 +9,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { Readable } from 'node:stream';
 import { pipeline } from 'node:stream/promises';
-import { dashscopeApiBase } from './provider-protocol.js';
+import { dashscopeApiBase, isDashScopeBaseUrl } from './provider-protocol.js';
 import { chmodPrivateFile, ensurePrivateDir, privateSibling } from './private-storage.js';
 
 /**
@@ -31,7 +31,10 @@ function timeoutSignal(ms, external) {
 }
 
 function authHeaders(key) {
-  return { Authorization: `Bearer ${key}`, 'Content-Type': 'application/json' };
+  return {
+    ...(typeof key === 'string' && key.trim() ? { Authorization: `Bearer ${key}` } : {}),
+    'Content-Type': 'application/json'
+  };
 }
 
 async function readJson(res) {
@@ -317,25 +320,59 @@ export async function openAiGenerateImage({ key, baseUrl, model, prompt, size =
   return out;
 }
 
-/* ---------------- 模型发现（OpenAI 兼容 GET /models，各家通用） ---------------- */
+/* ---------------- 模型发现（OpenAI GET /models + DashScope GET /api/v1/models） ---------------- */
 /**
- * 拉取 provider 可用模型 id 列表。OpenAI 标准端点，DashScope compatible-mode 亦支持。
- * 免费只读；返回 [{ id }] 原样（分类由 models.js 规则负责）。
- * @returns {Promise<string[]>}
+ * 拉取供应商模型目录。DashScope 官方端点分页读取并保留 capabilities；
+ * 普通 OpenAI 兼容端点维持 GET /models 与字符串 id 返回形状。
+ * @returns {Promise<Array<string|{id:string,capabilities?:string[]}>>}
  */
 export async function listModels({ key, baseUrl, timeoutMs = T_SUBMIT, signal }) {
   const base = String(baseUrl || '').trim().replace(/\/+$/, '');
   if (!base) throw new Error('iris: 供应商缺 baseUrl，无法发现模型');
-  const res = await fetch(`${base}/models`, { headers: authHeaders(key), signal: timeoutSignal(timeoutMs, signal) });
-  const body = await readJson(res);
-  if (!res.ok) throw providerError(res.status, body, '模型发现失败');
-  const items = (body && Array.isArray(body.data) && body.data) || (Array.isArray(body && body.models) ? body.models : []);
-  const ids = [];
-  for (const it of items) {
-    const id = typeof it === 'string' ? it : it && it.id;
-    if (typeof id === 'string' && id && !ids.includes(id)) ids.push(id);
+  const dashscope = isDashScopeBaseUrl(base);
+  const endpoint = dashscope ? dashscopeApiBase(base) + '/models' : base + '/models';
+  const found = new Map();
+  const maxPages = dashscope ? 50 : 1;
+  let loaded = 0;
+  for (let page = 1; page <= maxPages; page++) {
+    const url = new URL(endpoint);
+    if (dashscope) {
+      url.searchParams.set('page_no', String(page));
+      url.searchParams.set('page_size', '100');
+    }
+    const res = await fetch(url, { headers: authHeaders(key), signal: timeoutSignal(timeoutMs, signal) });
+    const body = await readJson(res);
+    if (!res.ok) throw providerError(res.status, body, '模型发现失败');
+    const output = body && body.output;
+    const items = (output && Array.isArray(output.models) && output.models)
+      || (body && Array.isArray(body.data) && body.data)
+      || (Array.isArray(body && body.models) ? body.models : []);
+    loaded += items.length;
+    for (const item of items) {
+      const id = String(typeof item === 'string' ? item : item?.id || item?.model || '').trim();
+      if (!id || found.has(id)) continue;
+      const capabilities = Array.isArray(item?.capabilities)
+        ? item.capabilities.filter((value) => typeof value === 'string' && value)
+        : [];
+      const requestModalities = Array.isArray(item?.inference_metadata?.request_modality)
+        ? item.inference_metadata.request_modality.map((value) => String(value).toLowerCase()) : [];
+      const responseModalities = Array.isArray(item?.inference_metadata?.response_modality)
+        ? item.inference_metadata.response_modality.map((value) => String(value).toLowerCase()) : [];
+      if (responseModalities.includes('image')) capabilities.push('IG');
+      if (responseModalities.includes('video')) capabilities.push('VG');
+      if (requestModalities.includes('audio') && responseModalities.includes('text')) capabilities.push('ASR');
+      if (requestModalities.includes('text') && responseModalities.includes('audio')) capabilities.push('TTS');
+      if (requestModalities.includes('image') && responseModalities.includes('text')) capabilities.push('VU');
+      const normalizedCapabilities = [...new Set(capabilities)];
+      found.set(id, normalizedCapabilities.length ? { id, capabilities: normalizedCapabilities } : id);
+    }
+    if (!dashscope) break;
+    const statedTotal = Number(output?.total);
+    const total = Number.isFinite(statedTotal) && statedTotal >= 0 ? statedTotal : null;
+    if (!items.length || (total !== null && loaded >= total) || items.length < 100) break;
+    if (page === maxPages) throw new Error('iris: 模型目录超过安全分页上限，已保留原模型池');
   }
-  return ids;
+  return [...found.values()];
 }
 
 /* ---------------- 视觉理解（OpenAI 兼容 SSE 流式） ---------------- */

package/lib/api.js

@@ -7,7 +7,7 @@
  *
  * 输出纪律（与整仓一致）：
  * - 只回标量字段（字符串/数字/布尔/受限数组），apiKey 永不明文，只给 hint；
- * - 文件路径只给相对 outputs/ 的 basename + 授权播放链接（token 随机 128bit）；
+ * - legacy 文件路径只给相对 outputs/ 的 basename + 128-bit token 链接；Core 媒体按随机 Artifact ID 读取，不宣称独立 token；
  * - tasks/providers 读的是 $DSH_HOME/iris/v1 的持久 JSON，与任务盯守共用同一存储。
  */
 import fs from 'node:fs';
@@ -19,10 +19,11 @@ import * as tasks from './tasks.js';
 import * as artifacts from './artifacts.js';
 import { runAction } from './actions.js';
 import { chmodPrivateFile, ensurePrivateDir } from './private-storage.js';
-import { inferMediaProtocol } from './provider-protocol.js';
+import { selectMediaProtocol } from './provider-protocol.js';
 import { deriveUserState } from './task-semantics.js';
 import { hostDoctor } from './doctor.js';
 import { hostRuntimeEvidence, recordHostClient } from './host-runtime.js';
+import { cancelProviderTaskForDsh, coreSnapshotForDsh, disposeCoreTaskAttention, readCoreArtifactMediaForDsh, redeliverProviderTaskForDsh, reobserveProviderTaskForDsh, retryProviderTaskForDsh } from './dsh-core-adapter.js';
 import { optimizePrompt } from './prompt-optimizer.js';
 import {
   importPromptOptimizerConfig,
@@ -55,8 +56,9 @@ function providerPublic(p) {
     name: p.name || p.id,
     type: p.type || 'openai',
     baseUrl: p.baseUrl,
+    mediaBaseUrl: p.mediaBaseUrl || '',
     enabled: p.enabled !== false,
-    mediaProtocol: p.mediaProtocol || inferMediaProtocol(p.baseUrl),
+    ...selectMediaProtocol(p),
     apiKeyHint: keyHint(p.apiKey),
     capabilities: capabilitiesOf(p),
     // 迁移/推断结果是否与原始声明不同（UI 提示旧配置已推断）
@@ -337,6 +339,13 @@ export function serveApi(req, res, host) {
       if (urlPath === '/iris/api/upload') {
         return handleUpload(req, res);
       }
+      // D4 人工 retry as new task：产生新的真实计费，请求体必须显式 confirmBilling:true
+      const coreTaskRetry = urlPath.match(/^\/iris\/api\/core\/task\/([^/]+)\/retry\/?$/);
+      if (coreTaskRetry) return handleCoreTaskRetry(coreTaskRetry[1], req, res);
+      // D1/D2/D3 人工动作：reobserve 显式单步 poll 一次；redeliver 只对 succeeded+failed
+      // 重新取回产物；cancel 只有 Provider 明确确认才写已取消。三者绝不 submit。
+      const coreTaskAction = urlPath.match(/^\/iris\/api\/core\/task\/([^/]+)\/(reobserve|redeliver|cancel|acknowledge|restore|hide|unhide)\/?$/);
+      if (coreTaskAction) return handleCoreTaskManual(coreTaskAction[2], coreTaskAction[1], req, res);
       const promptMatch = typeof host === 'object' && urlPath.match(/^\/iris\/api\/prompt-optimizer\/(optimize|import|reset|enabled)\/?$/);
       if (promptMatch) return handlePromptOptimizer(host, promptMatch[1], req, res);
       const actionMatch = typeof host === 'object' && urlPath.match(/^\/iris\/api\/actions\/([A-Za-z0-9_-]+)\/?$/);
@@ -359,6 +368,13 @@ export function serveApi(req, res, host) {
       if (!host || typeof host !== 'object') return sendJson(res, 503, { error: 'host unavailable' });
       return sendJson(res, 200, method === 'HEAD' ? {} : hostDoctor(host, hostRuntimeEvidence()));
     }
+    if (urlPath === '/iris/api/core/snapshot') {
+      if (method === 'HEAD') return sendJson(res, 200, {});
+      const query = new URL(req.url || '', 'http://iris.local').searchParams;
+      return serveCoreSnapshot(res, { limit: Number(query.get('limit') || 12) });
+    }
+    const coreMediaMatch = urlPath.match(/^\/iris\/api\/core\/artifact\/(artifact_[a-f0-9]{24})\/media$/);
+    if (coreMediaMatch) return serveCoreArtifactMedia(coreMediaMatch[1], method, res);
     if (urlPath === '/iris/api/artifacts') {
       const query = new URL(req.url || '', 'http://iris.local').searchParams;
       const page = artifacts.page({ offset: Number(query.get('offset') || 0), limit: Number(query.get('limit') || 24) });
@@ -384,6 +400,37 @@ export function serveApi(req, res, host) {
   }
 }
 
+async function serveCoreArtifactMedia(artifactId, method, res) {
+  try {
+    const result = await readCoreArtifactMediaForDsh(artifactId);
+    if (res.writableEnded || res.destroyed) return;
+    res.writeHead(200, {
+      'Content-Type': result.artifact.mediaType,
+      'Content-Length': result.bytes.length,
+      'Content-Disposition': 'inline',
+      'Cache-Control': 'private, max-age=3600',
+      'X-Content-Type-Options': 'nosniff',
+      'Cross-Origin-Resource-Policy': 'same-origin',
+      'Referrer-Policy': 'no-referrer'
+    });
+    res.end(method === 'HEAD' ? undefined : result.bytes);
+  } catch (_) {
+    return sendJson(res, 404, { error: 'not found' });
+  }
+}
+
+async function serveCoreSnapshot(res, options = {}) {
+  try {
+    return sendJson(res, 200, await coreSnapshotForDsh({ limit: options.limit || 12 }));
+  } catch (error) {
+    console.error('[iris] Core 只读快照失败：', error && error.code || 'unknown');
+    return sendJson(res, 409, {
+      schemaVersion: 0, available: true, readOnly: true,
+      error: { code: String(error && error.code || 'IRIS_CORE_SNAPSHOT_FAILED') }
+    });
+  }
+}
+
 function sendJson(res, status, obj) {
   if (res.writableEnded || res.destroyed) return; // 已结束/已销毁的连接不再写（end 后二次 end 防御）
   if (!res.headersSent) res.writeHead(status, { 'Content-Type': 'application/json; charset=utf-8', 'Cache-Control': 'no-store', 'X-Content-Type-Options': 'nosniff' });
@@ -424,8 +471,9 @@ function handleJsonPost(req, res, execute) {
       const result = await execute(body, controller.signal);
       finish(200, result);
     } catch (err) {
-      finish(controller.signal.aborted ? 499 : 400, {
-        error: controller.signal.aborted ? 'request canceled' : String((err && err.message) || err)
+      finish(controller.signal.aborted ? 499 : (Number(err && err.statusCode) || 400), {
+        error: controller.signal.aborted ? 'request canceled' : String((err && err.message) || err),
+        ...(err && err.code ? { code: String(err.code) } : {})
       });
     }
   });
@@ -436,6 +484,105 @@ function handleAction(host, name, req, res) {
   return handleJsonPost(req, res, (args, signal) => runAction(host, name, args, { signal }));
 }
 
+/**
+ * POST /iris/api/core/task/:id/(reobserve|redeliver) —— D1/D2 人工动作。
+ * 成功返回 200 + 任务最新五类用户投影行；坏 ID/未知/不满足动作门映射为稳定 4xx。
+ * 任何拒绝都在 Provider 调用与 Task 写入之前发生；错误体不含绝对路径、Key、
+ * 供应商身份或 binding。请求体不接受参数（Task ID 只在 URL 里），客户端断开
+ * 经 AbortSignal 传入在途操作，与 GUI actions 同一约定。
+ */
+const CORE_TASK_MANUAL_ACTIONS = Object.freeze({
+  reobserve: { command: 'task.reobserve', run: reobserveProviderTaskForDsh },
+  redeliver: { command: 'task.redeliver', run: redeliverProviderTaskForDsh },
+  cancel: { command: 'task.cancel', run: cancelProviderTaskForDsh },
+  // 注意力处置是 Host 偏好（不写 Core 事实）：acknowledge/restore/hide/unhide。
+  acknowledge: { command: 'attention.acknowledge', run: (input) => disposeCoreTaskAttention({ ...input, action: 'acknowledge' }) },
+  restore: { command: 'attention.restore', run: (input) => disposeCoreTaskAttention({ ...input, action: 'restore' }) },
+  hide: { command: 'attention.hide', run: (input) => disposeCoreTaskAttention({ ...input, action: 'hide' }) },
+  unhide: { command: 'attention.unhide', run: (input) => disposeCoreTaskAttention({ ...input, action: 'unhide' }) }
+});
+
+/**
+ * POST /iris/api/core/task/:id/retry —— D4 人工重试为新任务。
+ * body 必须携带 { prompt, confirmBilling: true, modelRef? }：Core 记录不持久化
+ * Prompt，只能由调用方重新提供；缺显式计费确认在读取旧 Task 之前拒绝。
+ * 成功返回 200 + 新任务的五类用户投影行与 retriedFrom 关系。
+ */
+function handleCoreTaskRetry(taskId, req, res) {
+  if (!/^task_[a-f0-9]{24}$/.test(taskId)) {
+    return sendJson(res, 400, { error: { code: 'IRIS_DSH_TASK_INVALID', message: 'Core Task ID 无效' } });
+  }
+  handleJsonPost(req, res, async (body, signal) => {
+    try {
+      if (!body || body.confirmBilling !== true) {
+        const error = new Error('重试会创建新任务并可能产生重复生成费用；请求体必须显式 confirmBilling:true');
+        error.code = 'IRIS_COMMAND_BILLING_CONFIRM_REQUIRED';
+        error.statusCode = 400;
+        throw error;
+      }
+      const prompt = String(body.prompt || '');
+      const result = await retryProviderTaskForDsh({
+        taskId,
+        prompt,
+        ...(body.text !== undefined ? { text: String(body.text) } : {}),
+        ...(body.voice !== undefined ? { voice: String(body.voice) } : {}),
+        ...(body.audio_url !== undefined ? { audio_url: String(body.audio_url) } : {}),
+        modelRef: typeof body.modelRef === 'string' && body.modelRef.trim() ? body.modelRef.trim() : undefined,
+        confirmBilling: true,
+        signal
+      });
+      return {
+        ok: true,
+        contractVersion: 0,
+        command: 'task.retry',
+        retriedFrom: result.retriedFrom,
+        task: result.row
+      };
+    } catch (error) {
+      const code = String(error && error.code || '');
+      error.statusCode = Number(error.statusCode)
+        || (code === 'IRIS_TASK_NOT_FOUND' ? 404
+          : (code === 'IRIS_TASK_NOT_RETRYABLE' || code.startsWith('IRIS_PROVIDER_')) ? 409
+          : 400);
+      throw error;
+    }
+  });
+}
+
+function handleCoreTaskManual(action, taskId, req, res) {
+  if (!/^task_[a-f0-9]{24}$/.test(taskId)) {
+    return sendJson(res, 400, { error: { code: 'IRIS_DSH_TASK_INVALID', message: 'Core Task ID 无效' } });
+  }
+  const entry = CORE_TASK_MANUAL_ACTIONS[action];
+  if (!entry) return sendJson(res, 404, { error: 'not found' });
+  const controller = new AbortController();
+  let completed = false;
+  const finish = (status, body) => {
+    if (completed) return;
+    completed = true;
+    sendJson(res, status, body);
+  };
+  const disconnect = () => { if (!completed) controller.abort(); };
+  if (typeof req.on === 'function') req.on('aborted', disconnect);
+  if (typeof res.on === 'function') res.on('close', disconnect);
+  if (typeof req.resume === 'function') req.resume(); // 无 body 入参；避免小请求体滞留
+  entry.run({ taskId, signal: controller.signal })
+    .then((result) => finish(200, {
+      ok: true,
+      contractVersion: 0,
+      command: entry.command,
+      task: result.row
+    }))
+    .catch((error) => {
+      const code = String(error && error.code || 'IRIS_CORE_MANUAL_ACTION_FAILED');
+      const status = controller.signal.aborted ? 499
+        : code === 'IRIS_TASK_NOT_FOUND' ? 404
+        : (code === 'IRIS_TASK_ID_INVALID' || code === 'IRIS_DSH_TASK_INVALID') ? 400
+        : 409;
+      finish(status, { error: { code, message: String((error && error.message) || '无法执行 Core Task 动作') } });
+    });
+}
+
 function handlePromptOptimizer(host, operation, req, res) {
   return handleJsonPost(req, res, async (body, signal) => {
     if (operation === 'optimize') return optimizePrompt(host, body, { signal });