@mokuyoaxis/dsh-iris 0.2.3 → 0.2.4

package/lib/client.js

@@ -21,7 +21,7 @@ window.__ModuleLoader__.load({ id: '@mokuyoaxis/dsh-iris', factory: (require) =>
   var exports = module.exports;
 
   var React = require('react');
-  var IRIS_CLIENT_VERSION = '0.2.3';
+  var IRIS_CLIENT_VERSION = '0.2.4';
   var HOST_CLIENT_PROTOCOL_VERSION = 0;
   var reportedSeats = [];
 
@@ -858,7 +858,7 @@ window.__ModuleLoader__.load({ id: '@mokuyoaxis/dsh-iris', factory: (require) =>
             React.createElement('select', { value: m.musicProtocol || '', onChange: function (e) { setMusicProtocol(m, e.target.value); } },
               React.createElement('option', { value: '' }, '请选择音乐协议'),
               React.createElement('option', { value: 'gemini-web-music' }, 'Chat Completions（内嵌音频）'))) : null,
-          caps.includes('vision') || (caps.includes('image-gen') && m.imageRouting && m.imageRouting.mediaProtocol === 'openai-chat-images') ? React.createElement(VisionInputEditor, { key: 'vision-input', provider: p, model: m,
+          caps.includes('vision') || (caps.includes('image-gen') && m.imageRouting && m.imageRouting.editSupported) ? React.createElement(VisionInputEditor, { key: 'vision-input', provider: p, model: m,
             onNote: props.onNote, onDone: props.onDone }) : null,
           blocked ? React.createElement('span', { className: 'iris-pm-ver failed ' + healthClass(blocked), title: healthText(blocked) }, rateLimitLabel(blocked)) : null,
           React.createElement('button', { className: 'iris-pm-btn danger', title: '从池移除', onClick: function () { props.removeModel(p, m); } }, '✕'));
@@ -937,7 +937,7 @@ window.__ModuleLoader__.load({ id: '@mokuyoaxis/dsh-iris', factory: (require) =>
             placeholder: '最长边 px（可选）', value: dimensionPair[0], onChange: function (e) { dimensionPair[1](e.target.value); } }),
           React.createElement('button', { className: 'iris-pm-btn', onClick: function () { save(false); } }, '保存预算'),
           React.createElement('button', { className: 'iris-pm-btn', onClick: function () { save(true); } }, '恢复继承')),
-        React.createElement('span', { className: 'iris-pm-note' }, '用于看图、OCR 每块输入和定位。作品原图保留，定位结果换算回原图。'));
+        React.createElement('span', { className: 'iris-pm-note' }, '用于看图、OCR 每块输入、定位和改图的发送副本。作品原图保留，定位结果换算回原图。'));
     }
 
     function ProviderEndpointEditor(props) {
@@ -1175,8 +1175,8 @@ window.__ModuleLoader__.load({ id: '@mokuyoaxis/dsh-iris', factory: (require) =>
           if (!r.ok || !r.d) return;
           var opts = (r.d.poolByCapability && r.d.poolByCapability[capability]) || [];
           var ord = (r.d.order && r.d.order[capability]) || [];
-          if (capability === 'music-gen') opts = opts.filter(function (option) { return ord.includes(option.ref); });
-          var assignedRef = ord[0] || (capability !== 'music-gen' && opts[0] && opts[0].ref) || '';
+          opts = ord.map(function (ref) { return opts.find(function (option) { return option.ref === ref; }); }).filter(Boolean);
+          var assignedRef = ord[0] || '';
           var assignedOpt = opts.find(function (o) { return o.ref === assignedRef; });
           // 不再自动填 vals.model：留空 = 用能力分配的解析结果（避免绕过分配）
           setModelInfo({ assigned: assignedOpt ? assignedOpt.label : '', assignedRef: assignedRef, options: opts, loaded: true });
@@ -1203,11 +1203,11 @@ window.__ModuleLoader__.load({ id: '@mokuyoaxis/dsh-iris', factory: (require) =>
       if (open) {
         var inputs = fields.map(function (f) {
           var node;
-          if (f.key === 'model' && capability === 'music-gen') {
+          if (f.key === 'model' && capability) {
             node = React.createElement('select', { value: vals.model || '', onChange: function (e) { setVal('model', e.target.value); } },
-              React.createElement('option', { value: '' }, '按 Music 分配顺序'),
+              React.createElement('option', { value: '' }, '按功能分配顺序'),
               ((modelInfo && modelInfo.options) || []).map(function (option) {
-                return React.createElement('option', { key: option.ref, value: option.ref }, option.label);
+                return React.createElement('option', { key: option.ref, value: option.ref, disabled: option.unavailable }, option.label + (option.unavailable ? ' · 当前不可用' : ''));
               }));
             return React.createElement('div', { key: f.key, className: 'iris-act-field' }, React.createElement('label', {}, f.label), node);
           }
@@ -1254,15 +1254,15 @@ window.__ModuleLoader__.load({ id: '@mokuyoaxis/dsh-iris', factory: (require) =>
           modelBar = React.createElement('div', { className: 'iris-act-field' },
             React.createElement('label', {},
               React.createElement('span', { className: 'iris-pm-dot ' + healthClass(cardHealth) }, cardHealth.retryAt ? '◷' : HEALTH_META[cardHealth.status].symbol),
-              ' 模型：' + (shown || (capability === 'music-gen' ? '未分配' : '自动')) + (available ? '' : '（无可用模型）')),
+              ' 模型：' + (shown || '未分配') + (available ? '' : '（无可用模型）')),
             React.createElement('div', { className: 'iris-wb-muted' },
-              healthText(cardHealth) + ' · 改分配 → 上方「能力分配（failover 顺序）」'));
+              healthText(cardHealth) + ' · 改分配 → 上方「功能分配（调用顺序）」'));
         }
         body = React.createElement('div', { className: 'iris-act-body' },
           modelBar,
           inputs,
           React.createElement('button', { className: 'iris-act-run', disabled: run === 'running', onClick: submit },
-            run === 'running' ? '执行中…' : '执行'),
+            run === 'running' ? '执行中…' : (props.submitLabel || '执行')),
           result);
       }
       var headStatus = capability ? cardHealth.status : 'verified';
@@ -1282,6 +1282,8 @@ window.__ModuleLoader__.load({ id: '@mokuyoaxis/dsh-iris', factory: (require) =>
 
     /* ---- 操作卡片注册表（单一来源：设置页全量 / 泡泡常用子集 / 选择器三处共用） ---- */
     var CARD_DEFS = [
+      { action: 'image_import', title: '📥 导入图片', submitLabel: '保存到作品', fields: [
+        { key: 'image_path', label: '图片（静态 PNG/JPEG/WebP，最大20 MiB；保存副本，保留原文件）', type: 'file', accept: 'image/png,image/jpeg,image/webp' }] },
       { action: 'image', title: '🎨 画图', capability: 'image-gen', fields: [
         { key: 'prompt', label: '提示词', type: 'textarea', placeholder: '详细描述要生成的图片' },
         { key: 'size', label: '尺寸 (可选)', placeholder: '如 1024*1024' },
@@ -1383,7 +1385,7 @@ window.__ModuleLoader__.load({ id: '@mokuyoaxis/dsh-iris', factory: (require) =>
           var opt = opts.find(function (o) { return o.ref === ref; });
           return React.createElement('span', { key: ref, className: 'iris-cap-chip' },
             React.createElement('b', {}, (i + 1) + '.'),
-            opt ? opt.label : ref,
+            opt ? opt.label + (opt.unavailable ? ' · 当前不可用' : '') : ref + ' · 配置已失效',
             i > 0 ? React.createElement('button', {
               className: 'iris-pm-btn', title: '上移',
               onClick: function () { var n = list.slice(); var t = n.splice(i, 1)[0]; n.splice(i - 1, 0, t); save(row.cap, n); }
@@ -1399,17 +1401,17 @@ window.__ModuleLoader__.load({ id: '@mokuyoaxis/dsh-iris', factory: (require) =>
         });
         return React.createElement('div', { key: row.cap, className: 'iris-cap-row' },
           React.createElement('span', { className: 'iris-cap-name' }, row.label),
-          chips.length ? chips : React.createElement('span', { className: 'iris-cap-auto' }, row.cap === 'music-gen' ? '尚未分配音乐模型' : '自动（按池顺序）'),
+          chips.length ? chips : React.createElement('span', { className: 'iris-cap-auto' }, '尚未分配模型'),
           available.length ? React.createElement('select', {
             className: 'iris-pm-model-sel', value: '',
             onChange: function (e) { if (e.target.value) save(row.cap, list.concat([e.target.value])); }
           },
-            React.createElement('option', { value: '' }, '+ 加入 failover'),
+            React.createElement('option', { value: '' }, '+ 分配模型'),
             available.map(function (o) { return React.createElement('option', { key: o.ref, value: o.ref }, o.label); })) : null,
           list.length ? React.createElement('button', {
-            className: 'iris-pm-btn', title: '清除手动分配，回退自动',
+            className: 'iris-pm-btn', title: '清空分配后，该功能不再发起新调用',
             onClick: function () { save(row.cap, []); }
-          }, '恢复自动') : null);
+          }, '清空分配') : null);
       }));
     }
 
@@ -1563,7 +1565,7 @@ window.__ModuleLoader__.load({ id: '@mokuyoaxis/dsh-iris', factory: (require) =>
     }
 
     function galleryKindLabel(kind) {
-      return ({ __proto__: null, 'generated-image': '生成图片', 'generated-video': '生成视频', 'generated-audio': '生成音频',
+      return ({ __proto__: null, 'imported-image': '导入图片', 'generated-image': '生成图片', 'generated-video': '生成视频', 'generated-audio': '生成音频',
         'tts-audio': '合成语音', transcript: '转写文本', 'video-frame': '视频帧', crop: '裁剪图片',
         'cropped-image': '裁剪图片', 'pixel-diff': '差异热图', 'diff-heatmap': '差异热图', 'html-screenshot': 'HTML 截图',
         'legacy-output': '旧版作品' })[kind] || kind;
@@ -1779,19 +1781,15 @@ window.__ModuleLoader__.load({ id: '@mokuyoaxis/dsh-iris', factory: (require) =>
       var running = result && result.status === 'running';
       React.useEffect(function () {
         var active = true;
-        postAction('providers_list', {}).then(function (response) {
+        postAction('assignments_get', {}).then(function (response) {
           if (!active) return;
           if (!response.ok || !response.d.ok) throw new Error('模型列表读取失败');
           var choices = [];
-          (response.d.providers || []).forEach(function (provider) {
-            if (!provider.enabled) return;
-            (provider.models || []).forEach(function (entry) {
-              if ((entry.capabilities || []).indexOf('image-gen') < 0
-                  || !entry.imageRouting || entry.imageRouting.mediaProtocol !== 'openai-chat-images') return;
-              var health = entry.health && entry.health['image-gen'];
-              choices.push({ id: provider.id + '::' + entry.id, label: provider.name + ' · ' + entry.id,
-                blocked: !!(health && health.rateLimited) });
-            });
+          var pool = response.d.poolByCapability && response.d.poolByCapability['image-gen'] || [];
+          (response.d.order && response.d.order['image-gen'] || []).forEach(function (ref) {
+            var entry = pool.find(function (item) { return item.ref === ref; });
+            if (!entry || !entry.imageRouting || !entry.imageRouting.editSupported) return;
+            choices.push({ id: ref, label: entry.label, blocked: entry.unavailable === true });
           });
           setModels(choices);
         }).catch(function (error) { if (active) { setModels([]); setResult({ status: 'failed', text: error.message }); } });
@@ -1831,7 +1829,7 @@ window.__ModuleLoader__.load({ id: '@mokuyoaxis/dsh-iris', factory: (require) =>
           React.createElement('label', {}, '改图模型', React.createElement('select', { 'aria-label': '改图模型', value: model, disabled: !!running,
             onChange: function (e) { setModel(e.target.value); } }, React.createElement('option', { value: '' }, '按当前顺序选择可用改图模型'),
             (models || []).map(function (entry) { return React.createElement('option', { key: entry.id, value: entry.id, disabled: entry.blocked }, entry.label + (entry.blocked ? ' · 冷却或额度耗尽' : '')); }))),
-          models && !models.some(function (entry) { return !entry.blocked; }) ? React.createElement('div', { role: 'status' }, '暂无可用改图模型，请在模型设置中配置聊天生图协议，或手动实测恢复模型。') : null,
+          models && !models.some(function (entry) { return !entry.blocked; }) ? React.createElement('div', { role: 'status' }, '暂无可用改图模型，请在生图名单分配聊天生图或 DashScope Qwen 改图模型，并检查模型是否可用。') : null,
           React.createElement('div', { className: 'iris-gallery-actions' },
             React.createElement('button', { className: 'iris-clean-btn', type: 'button', disabled: !!running || !prompt.trim() || !models || !models.some(function (entry) { return !entry.blocked; }), onClick: execute }, running ? '编辑中…' : '生成修改版'),
             running ? React.createElement('button', { className: 'iris-pm-btn', type: 'button', onClick: cancel }, '停止等待') : null),
@@ -1956,6 +1954,7 @@ window.__ModuleLoader__.load({ id: '@mokuyoaxis/dsh-iris', factory: (require) =>
       var blocked = busy || mutating;
 
       return React.createElement('div', {},
+        React.createElement(ActionCard, CARD_DEFS.find(function (card) { return card.action === 'image_import'; })),
         React.createElement('div', { className: 'iris-gallery-tools' },
           React.createElement('span', { className: 'iris-clean-note' },
             '匹配 ' + data.total + ' 个作品 · Core ' + data.counts.core + ' · 旧版 ' + data.counts.legacy + ' · 清任务历史不会删除'),
@@ -2687,7 +2686,7 @@ window.__ModuleLoader__.load({ id: '@mokuyoaxis/dsh-iris', factory: (require) =>
         React.createElement('div', { className: 'iris-wb-sec' }, '能力健康'),
         React.createElement(CapabilityHealthOverview, {}),
         React.createElement('div', { className: 'iris-wb-muted' }, '绿色有效 7 天；真实成功或显式实测会刷新。429 冷却显示琥珀色，额度或预算耗尽显示红色；点击模型能力可实测恢复。不会后台探测。'),
-        React.createElement('div', { className: 'iris-wb-sec' }, '能力分配（failover 顺序）'),
+        React.createElement('div', { className: 'iris-wb-sec' }, '功能分配（调用顺序）'),
         React.createElement(CapabilityAssigner, {}),
         React.createElement('div', { className: 'iris-wb-sec' }, 'Iris 泡泡快捷卡片（勾选后显示在「⚡ 常用」标签）'),
         React.createElement(BubbleCardPicker, {}),

package/lib/command-service.js

@@ -21,11 +21,12 @@ import { videoTaskCandidates } from './video-input.js';
 import { waitForCoreTask } from './task-wait.js';
 import { planCoreDeletion, planCoreCleanup, quarantineCoreFiles, inspectCoreTransactions, restoreCoreTransaction } from './core-maintenance.js';
 import { deliveryCacheNeedsProvider } from './core-delivery-cache.js';
+import { readImportImage } from './image-import.js';
 
 export const COMMAND_CONTRACT_VERSION = 0;
 export const CORE_COMMANDS = Object.freeze([
   'crop', 'media.diff', 'media.frames', 'media.html', 'task.inspect', 'task.list', 'task.wait', 'task.observe', 'task.reobserve', 'task.redeliver', 'task.cancel', 'task.retry',
-  'task.inspect-many', 'artifact.inspect', 'artifact.inspect-many', 'artifact.list', 'artifact.export', 'artifact.export-many', 'artifact.rebuild',
+  'task.inspect-many', 'artifact.import', 'artifact.inspect', 'artifact.inspect-many', 'artifact.list', 'artifact.export', 'artifact.export-many', 'artifact.rebuild',
   'core.delete', 'core.cleanup', 'core.transactions', 'core.restore'
 ]);
 
@@ -109,6 +110,20 @@ export function createCommandService(runtime, ports = {}) {
 
   async function execute(name, input) {
     if (!CORE_COMMANDS.includes(name)) throw commandError('IRIS_COMMAND_UNKNOWN', `未知 Command：${String(name)}`);
+    if (name === 'artifact.import') {
+      exactInput(input, ['image_path', 'image_bytes']);
+      const hasPath = input.image_path !== undefined;
+      if (hasPath === (input.image_bytes !== undefined)) {
+        throw commandError('IRIS_COMMAND_INPUT_INVALID', '图片导入须且只能提供image_path或image_bytes之一');
+      }
+      const filePath = hasPath ? localImage(input) : undefined;
+      return runtime.run('execute', async ({ dataRoot, signal }) => {
+        const source = await readImportImage({ filePath, imageBytes: input.image_bytes }, signal);
+        signal.throwIfAborted();
+        const artifact = createCoreArtifact(dataRoot, { ...source, kind: 'imported-image' });
+        return Object.freeze({ contractVersion: COMMAND_CONTRACT_VERSION, command: name, artifact });
+      });
+    }
     if (name === 'core.delete' || name === 'core.cleanup') {
       exactInput(input, name === 'core.delete' ? ['task_ids', 'artifact_ids', 'confirm_delete'] : ['paths', 'older_than_ms', 'confirm_delete']);
       if (input.confirm_delete !== undefined && typeof input.confirm_delete !== 'boolean') throw commandError('IRIS_COMMAND_INPUT_INVALID', 'confirm_delete 必须是布尔值');

package/lib/config.js

@@ -183,37 +183,29 @@ export function providerById(id) {
 const FIELD_OF = models.CAP_FIELD;
 
 /**
- * 严格选择（阶段 6 模型池）：优先用「已分配模型」（有序列表取第一个可用），
- * 否则从全局模型池挑第一个有能力标签的模型。
+ * 严格选择：仅从功能分配名单取第一个可用模型。
  * 返回该模型所属 provider 的副本，并把该能力的模型字段设为选中模型。
  * 向后兼容：调用方继续读 provider.apiKey / provider.imageModel 等。
  * 无可用模型 → null（不再兜底到任意 provider）。
  */
 export function pickFor(capability) {
-  const pool = models.modelPool(providers());
-  let m = null;
-  for (const ref of assignmentOrder(capability)) {
-    m = pool.find((x) => !x.rateLimited && x.ref === ref && x.capabilities.includes(capability));
-    if (m) break;
-  }
-  if (!m && capability !== cap.CAPABILITIES.MUSIC) m = models.pickModel(pool, capability);
-  if (!m) return null;
-  const p = providerById(m.providerId);
-  if (!p) return null;
-  const field = FIELD_OF[capability];
-  return field ? { ...p, [field]: m.id } : p;
+  return pickAllFor(capability)[0] || null;
 }
 
 /**
  * 同一能力的有序 provider 列表（供 failover 依次尝试）：
- * 已分配顺序优先（阶段 6 条目 4），其余按池顺序补齐（去重）。
+ * 只使用已分配顺序，不补入全局池。
  * 一个 provider 若池里有多个该能力模型，会返回多条（各自带不同模型）。
  */
 export function pickAllFor(capability, { includeRateLimited = false } = {}) {
-  const pool = models.modelPool(providers());
+  const pool = models.modelPool(providers(), { includeHostVision: true });
   const chosen = models.orderedModels(pool, capability, assignments()[capability], { includeRateLimited });
   const out = [];
   for (const m of chosen) {
+    if (m.ref === models.HOST_VISION_REF) {
+      out.push({ id: models.HOST_VISION_REF, visionModel: m.id });
+      continue;
+    }
     const p = providerById(m.providerId);
     if (!p) continue;
     const field = FIELD_OF[capability];
@@ -233,11 +225,12 @@ const resolveAssignment = models.resolvePoolModel;
 export function assignmentOrder(capability) {
   const a = assignments()[capability];
   if (!a) return [];
-  const pool = models.modelPool(providers());
+  const pool = models.modelPool(allProviders(), { includeHostVision: true });
   const refs = [];
   for (const raw of (Array.isArray(a) ? a : [a])) {
     const m = resolveAssignment(pool, raw, capability);
     if (m && !refs.includes(m.ref)) refs.push(m.ref);
+    else if (!m && typeof raw === 'string' && models.parseModelRef(raw) && !refs.includes(raw)) refs.push(raw);
   }
   return refs;
 }
@@ -245,7 +238,7 @@ export function assignmentOrder(capability) {
 /** 设置某能力分配的模型 id（需在全局池中存在且具备该能力） */
 export function setAssignment(capability, ref) {
   const c = load();
-  const pool = models.modelPool(providers());
+  const pool = models.modelPool(allProviders(), { includeHostVision: true });
   const m = resolveAssignment(pool, ref, capability);
   if (!m) return false;
   if (!c.assignments) c.assignments = {};
@@ -256,7 +249,7 @@ export function setAssignment(capability, ref) {
 
 /**
  * 设置某能力的有序 failover 列表（阶段 6 条目 4）：每个模型须在全局池中存在且具备该能力。
- * 空数组 = 清除分配（回退池顺序自动选择）。重复 id 自动去重。
+ * 空数组 = 未分配，不自动选择。重复 id 自动去重。
  */
 export function setAssignmentOrder(capability, modelRefs) {
   const c = load();
@@ -268,7 +261,7 @@ export function setAssignmentOrder(capability, modelRefs) {
     }
     return true;
   }
-  const pool = models.modelPool(providers());
+  const pool = models.modelPool(allProviders(), { includeHostVision: true });
   const refs = [];
   for (const raw of modelRefs) {
     const m = resolveAssignment(pool, raw, capability);
@@ -281,7 +274,7 @@ export function setAssignmentOrder(capability, modelRefs) {
   return true;
 }
 
-/** 清除某个能力的手动分配（回退到池自动选择） */
+/** 清除功能分配；此后不再发起该功能的新调用。 */
 export function clearAssignment(capability) {
   const c = load();
   if (c.assignments && c.assignments[capability]) {
@@ -451,7 +444,8 @@ export function providerHealthSnapshot({ now = Date.now() } = {}) {
   for (const capability of Object.values(cap.CAPABILITIES)) {
     const candidates = pickAllFor(capability, { includeRateLimited: true }).map((provider) => {
       const modelId = String(provider[FIELD_OF[capability]] || '');
-      const health = modelHealth(provider.id, modelId, capability, { now });
+      const health = provider.id === models.HOST_VISION_REF ? { status: 'configured', source: 'configuration' }
+        : modelHealth(provider.id, modelId, capability, { now });
       return { providerId: provider.id, modelId, ...health };
     });
     const status = aggregateHealthStates(candidates.map((item) => item.status));

package/lib/doctor.js

@@ -1,6 +1,7 @@
 'use strict';
 import crypto from 'node:crypto';
 import fs from 'node:fs';
+import { isSupportedDshVersion, SUPPORTED_DSH_VERSIONS } from './dsh-compatibility.js';
 import os from 'node:os';
 import path from 'node:path';
 import { spawnSync } from 'node:child_process';
@@ -331,13 +332,6 @@ function summarizeChecks(checks) {
   };
 }
 
-function dshVersionSupported(value) {
-  /* 当前 0.2 候选只支持经真实安装服务隔离验收的准确 rc.2。
-     Iris 0.1.4 的旧宿主窗口保留在历史发行中，不用于放行当前源码。 */
-  const version = String(value || '').trim().replace(/\s+/g, '');
-  return /^0\.2\.0-rc\.2(?:\+.*)?$/.test(version);
-}
-
 function names(value) {
   return [...new Set((Array.isArray(value) ? value : []).map((item) => String(item || '').trim()).filter(Boolean))];
 }
@@ -379,12 +373,12 @@ export function hostDoctor(host, evidence = {}, options = {}) {
   if (snapshot.host.id === 'deepseek-harness') {
     if (snapshot.host.version === 'unknown') {
       checks.push(result('dsh-version', 'warn', '无法从当前进程识别 DSH 版本',
-        '使用 dsh --version 核对；当前候选仅支持 DSH 0.2.0-rc.2。'));
-    } else if (dshVersionSupported(snapshot.host.version)) {
+        '使用 dsh --version 核对；已验证版本为 DSH ' + SUPPORTED_DSH_VERSIONS.join('、') + '。'));
+    } else if (isSupportedDshVersion(snapshot.host.version)) {
       checks.push(result('dsh-version', 'ok', 'DSH ' + snapshot.host.version + ' 位于已验证支持范围'));
     } else {
       checks.push(result('dsh-version', 'error', 'DSH ' + snapshot.host.version + ' 超出已验证支持范围',
-        '当前候选需要 DSH 0.2.0-rc.2；旧 DSH 0.1.2 线或 0.1.5-rc.1 使用 Iris @mokuyoaxis/dsh-iris@0.1.4。其他版本须另行验收。'));
+        '当前支持 DSH ' + SUPPORTED_DSH_VERSIONS.join('、') + '；旧 DSH 0.1.2 线或 0.1.5-rc.1 使用 Iris @mokuyoaxis/dsh-iris@0.1.4。其他版本须另行验收。'));
     }
   }
 

package/lib/dsh-compatibility.js

@@ -0,0 +1,10 @@
+'use strict';
+
+/** 已完成宿主接口验收的版本；manifest/Doctor/验收脚本共用同一边界。 */
+export const SUPPORTED_DSH_VERSIONS = Object.freeze(['0.2.0-rc.2', '0.2.1-alpha.4']);
+export const DSH_SUPPORT_RANGE = SUPPORTED_DSH_VERSIONS.join(' || ');
+
+export function isSupportedDshVersion(value) {
+  const version = String(value || '').trim().split('+')[0];
+  return SUPPORTED_DSH_VERSIONS.includes(version);
+}

package/lib/dsh-core-adapter.js

@@ -68,6 +68,12 @@ function withReader(callback, signal) {
   return withRuntime('reader', callback, signal);
 }
 
+/** 本地图片与会话附件都交给同一导入Command，不创建生成任务。 */
+export function importImageForDsh(input = {}) {
+  return withWriter((_runtime, commands) => commands.execute('artifact.import', input.imageBytes !== undefined
+    ? { image_bytes: input.imageBytes } : { image_path: input.imagePath }), input.signal);
+}
+
 /**
  * 将 DSH 图片输入投影到共享 crop Command，再把中性 Artifact 读成宿主可保存的字节。
  * bytes 输入先成为 host-input Artifact，输出通过 derived-from 保留关系。
@@ -285,7 +291,7 @@ export function retryProviderTaskForDsh(input = {}) {
   return withWriter(async (runtime) => {
     const commands = createCommandService(runtime, {
       resolveTaskCandidates: ({ capability, modelRef }) => {
-        const catalog = { providers: allProviders(), ...(capability === 'music' ? { assignments: assignments() } : {}) };
+        const catalog = { providers: allProviders(), assignments: assignments() };
         const ref = modelRef || undefined;
         const candidates = capability === 'video'
           ? videoCandidatesFromCatalog(catalog, ref)

package/lib/host-runtime.js

@@ -10,6 +10,7 @@ export const IRIS_PLUGIN_ID = '@mokuyoaxis/dsh-iris';
 export const HOST_CLIENT_PROTOCOL_VERSION = 0;
 
 export const EXPECTED_IRIS_TOOLS = Object.freeze([
+  'iris_import_image',
   'iris_draw_image',
   'iris_edit_image',
   'iris_generate_video',

package/lib/image-edit-input.js

@@ -1,20 +1,22 @@
 'use strict';
-/** 聊天改图只接受当前 Core 中的静态图片；输入原字节不进入 Task 记录。 */
+/** 改图只接受当前 Core 中的静态图片；输入原字节不进入 Task 记录。 */
 import sharp from 'sharp';
 import { inspectCoreArtifact, readCoreArtifactBytes } from './core-artifacts.js';
 import { waitForModelWork } from './model-call-runtime.js';
+import { supportsImageEdit } from './provider-protocol.js';
 
 function invalid(message) {
   return Object.assign(new Error(message), { code: 'IRIS_IMAGE_EDIT_INPUT_INVALID' });
 }
 
 export function imageEditCandidates(candidates) {
+  const supported = candidate => supportsImageEdit(candidate.adapter.protocol, candidate.providerModel);
   if (candidates.some(candidate => candidate.selectionReason === 'explicit'
-      && candidate.adapter.protocol !== 'openai-chat-images')) {
-    throw invalid('指定模型的图片协议不支持聊天改图，请选择 openai-chat-images 模型');
+      && !supported(candidate))) {
+    throw invalid('指定模型的图片协议不支持此类改图，请选择聊天生图模型或 DashScope Qwen 原生改图模型');
   }
-  const selected = candidates.filter(candidate => candidate.adapter.protocol === 'openai-chat-images');
-  if (!selected.length) throw invalid('未配置可用的 openai-chat-images 生图模型，无法编辑原图');
+  const selected = candidates.filter(supported);
+  if (!selected.length) throw invalid('当前生图名单没有可用的聊天生图或 DashScope Qwen 改图模型');
   return selected;
 }
 

package/lib/image-import.js

@@ -0,0 +1,61 @@
+'use strict';
+
+import { open } from 'node:fs/promises';
+import sharp from 'sharp';
+
+export const MAX_IMPORT_IMAGE_BYTES = 20 * 1024 * 1024;
+const TYPES = Object.freeze({ png: 'image/png', jpeg: 'image/jpeg', webp: 'image/webp' });
+
+function invalid(message) {
+  return Object.assign(new Error(message), { code: 'IRIS_IMAGE_IMPORT_INVALID' });
+}
+
+function checkSize(size) {
+  if (!size || size > MAX_IMPORT_IMAGE_BYTES) throw invalid('导入图片必须非空，且不超过20 MiB');
+}
+
+/** 只读一次有界快照；后续校验和保存使用同一份字节，不再复制变化中的源路径。 */
+export async function readImportImage({ filePath, imageBytes }, signal) {
+  signal.throwIfAborted();
+  let bytes;
+  if (filePath) {
+    let file;
+    try {
+      file = await open(filePath, 'r');
+      const stat = await file.stat();
+      if (!stat.isFile()) throw invalid('导入来源必须是普通图片文件');
+      checkSize(stat.size);
+      bytes = Buffer.alloc(stat.size);
+      let offset = 0;
+      while (offset < bytes.length) {
+        signal.throwIfAborted();
+        const { bytesRead } = await file.read(bytes, offset, Math.min(65536, bytes.length - offset), offset);
+        if (!bytesRead) throw invalid('读取期间图片发生变化，请重新导入');
+        offset += bytesRead;
+      }
+      const extra = await file.read(Buffer.alloc(1), 0, 1, offset);
+      if (extra.bytesRead) throw invalid('读取期间图片发生变化，请重新导入');
+    } catch (error) {
+      signal.throwIfAborted();
+      if (error.code === 'IRIS_IMAGE_IMPORT_INVALID') throw error;
+      throw invalid('图片无法读取，请选择可读的普通文件');
+    } finally { await file?.close(); }
+  } else {
+    if (!(imageBytes instanceof Uint8Array)) throw invalid('导入图片内容必须是字节数据');
+    checkSize(imageBytes.byteLength);
+    bytes = Buffer.from(imageBytes);
+  }
+  signal.throwIfAborted();
+  let metadata;
+  try { metadata = await sharp(bytes).metadata(); }
+  catch (_) {
+    signal.throwIfAborted();
+    throw invalid('无法读取图片，请使用有效的静态PNG、JPEG或WebP');
+  }
+  signal.throwIfAborted();
+  const mediaType = TYPES[metadata.format];
+  if (!mediaType || metadata.pages > 1 || !metadata.width || !metadata.height) {
+    throw invalid('仅支持静态PNG、JPEG或WebP，不支持动画');
+  }
+  return { bytes, mediaType, metadata: { width: metadata.width, height: metadata.height } };
+}