@ckanner/flywheel 0.33.0 → 0.34.0

package/dist/client.js

@@ -815,6 +815,53 @@ function Feedback({ control, selection, reconcile, t }) {
         !selection.taskDir.trim() && h('p', null, t('taskRequired'))));
 }
 
+// Plain-JS external clients supply real schema factories through the public
+// Typert codec contract; src-json is not a valid generated Client input codec.
+function consoleReadCodec(type, parse) {
+  return { mode: 'strict', typeSymbol: '@ckanner/flywheel#' + type, create: () => ({ parse }) };
+}
+function consoleReadObject(value, keys, label) {
+  if (!record(value) || Object.keys(value).some(key => !keys.includes(key))) throw new Error('Invalid ' + label);
+  return value;
+}
+function consoleReadString(value, label) {
+  if (typeof value !== 'string' || !value.trim()) throw new Error('Invalid ' + label);
+  return value;
+}
+function consoleReadInput(value) {
+  consoleReadObject(value, ['action', 'taskDir', 'cwd', 'probe', 'editor', 'packet', 'runId', 'sessionKey', 'delivery'], 'console read request');
+  if (!['runs', 'status', 'config', 'config-edit', 'metrics', 'history', 'node', 'delivery', 'doctor'].includes(value.action)) throw new Error('Console Remote accepts reads only');
+  const output = { action: value.action };
+  for (const key of ['taskDir', 'cwd', 'packet', 'runId', 'sessionKey']) {
+    if (value[key] !== undefined) output[key] = consoleReadString(value[key], key);
+  }
+  if (value.probe !== undefined) {
+    if (value.action !== 'doctor' || typeof value.probe !== 'boolean') throw new Error('Invalid doctor probe');
+    output.probe = value.probe;
+  }
+  if (value.action === 'config-edit') {
+    consoleReadObject(value.editor, ['scope'], 'configuration scope');
+    if (!['global', 'project'].includes(value.editor.scope)) throw new Error('Invalid configuration scope');
+    output.editor = { scope: value.editor.scope };
+  } else if (value.editor !== undefined) throw new Error('Editor requires config-edit');
+  if (value.action === 'delivery') {
+    consoleReadObject(value.delivery, ['action', 'headBranch'], 'delivery inspection');
+    if (value.delivery.action !== 'inspect') throw new Error('Delivery Remote accepts inspection only');
+    output.delivery = { action: 'inspect' };
+    if (value.delivery.headBranch !== undefined) output.delivery.headBranch = consoleReadString(value.delivery.headBranch, 'headBranch');
+  } else if (value.delivery !== undefined) throw new Error('Delivery requires inspection');
+  if (value.action === 'node' ? !/^M\d+-T\d+$/.test(output.packet ?? '') : value.packet !== undefined) throw new Error('Invalid node packet');
+  if (value.action === 'history' ? !output.sessionKey : value.sessionKey !== undefined) throw new Error('Invalid history session key');
+  if (value.runId !== undefined && (value.action !== 'metrics' || value.runId.length > 128 || /[\0\r\n]/.test(value.runId))) throw new Error('Invalid metrics run ID');
+  return output;
+}
+function consoleReadResult(value) {
+  consoleReadObject(value, ['result'], 'console read result');
+  const result = consoleReadObject(value.result, ['kind', 'text'], 'console result envelope');
+  if (!['success', 'error'].includes(result.kind) || typeof result.text !== 'string') throw new Error('Invalid console result envelope');
+  return { result: { kind: result.kind, text: result.text } };
+}
+
 exports.inject = ['slots', 'remote', 'remote.commands', 'locale'];
 exports.apply = function apply(ctx) {
   ctx.effect(() => ctx.locale.register(NS, { zh, en }), 'flywheel: locales');
@@ -833,10 +880,25 @@ exports.apply = function apply(ctx) {
   const readsReady = ctx.remote.$mount({ package: '@ckanner/flywheel', descriptors: [{
     id: '@ckanner/flywheel#flywheelConsole/read', service: 'flywheelConsole', namespace: 'flywheelConsole', method: 'read',
     invocation: { kind: 'direct' }, parameters: [
-      { name: 'agent', wire: 'sessionId', source: 'lookup', lookup: 'agent', codec: { mode: 'src-json' } },
-      { name: 'input', wire: 'input', source: 'json', codec: { mode: 'src-json' } },
-    ], cancellation: { parameter: 'signal' }, result: { mode: 'src-json' },
-  }] });
+      { name: 'agent', wire: 'agentId', source: 'lookup', lookup: 'agent', codec: consoleReadCodec('SessionId', value => consoleReadString(value, 'sessionId')) },
+      { name: 'input', wire: 'input', source: 'json', codec: consoleReadCodec('ConsoleReadRequest', consoleReadInput) },
+    ], cancellation: { parameter: 'signal' }, result: { ...consoleReadCodec('ConsoleReadResult', consoleReadResult), decode: consoleReadResult },
+  }] }).then(async () => {
+    let readConsole;
+    // The namespace is installed asynchronously by $mount. Own its consumer in
+    // an injected child scope; the outer plugin cannot access undeclared services.
+    const consumer = ctx.inject(['remote.flywheelConsole'], scope => {
+      readConsole = (sessionId, request) => scope.remote.flywheelConsole.read(sessionId, request);
+    });
+    try {
+      await consumer;
+      if (disposed || !readConsole) throw new Error('Flywheel read scope is unavailable');
+      return readConsole;
+    } catch (error) {
+      await consumer.dispose();
+      throw error;
+    }
+  });
   // A missing read capability is a visible error, never a noisy command fallback.
   readsReady.catch(() => {});
   ctx.slots.inject('conversation.view', () => ctx.slots.register({
@@ -851,7 +913,7 @@ exports.apply = function apply(ctx) {
         control = createControl(async request => {
           const value = readReply(await (mutates(request.action) || request.action === 'status' && control?.source.getSnapshot().uncertainty
             ? ctx.remote.commands.execute(sessionId, '/flywheel ' + JSON.stringify(request), [])
-            : readsReady.then(() => ctx.remote.flywheelConsole.read(sessionId, request))), request);
+            : readsReady.then(readConsole => readConsole(sessionId, request))), request);
           if (Array.isArray(value.runs)) value.runs = value.runs.filter(item => item.hostSessionId === sessionId);
           return value;
         }, pendingOperations, () => disposed);
@@ -1312,7 +1374,7 @@ function RuntimeDecisionPanel({ ledger, packetID, t }) {
 
 function validExecutionPolicyHistory(packet) {
   const policy = packet?.['execution-policy'];
-  const binding = value => record(value) && ['harness', 'provider', 'channel', 'model', 'thinking', 'permission', 'sessionMode']
+  const binding = value => record(value) && ['harness', 'provider', 'channel', 'model', 'thinking', 'nativeProfile', 'permission', 'sessionMode']
     .every(key => value[key] == null || typeof value[key] === 'string');
   return record(packet) && (policy == null || record(policy) &&
     (policy.history == null || Array.isArray(policy.history) && policy.history.every(change =>
@@ -1324,7 +1386,7 @@ function ExecutionPolicyChanges({ packets, packetID, t }) {
   const changes = Object.entries(packets ?? {}).flatMap(([id, packet]) => !packetID || id === packetID
     ? (packet['execution-policy']?.history ?? []).map(change => ({ id, change })) : []);
   if (!changes.length) return null;
-  const fields = ['harness', 'provider', 'channel', 'model', 'thinking', 'permission', 'sessionMode'];
+  const fields = ['harness', 'provider', 'channel', 'model', 'thinking', 'nativeProfile', 'permission', 'sessionMode'];
   const bindingDetails = (binding, label) => h('div', null,
     h('p', null, t(label)),
     h('dl', { className: css.consoleProperties }, ...fields.filter(field => binding[field]).map(field =>
@@ -2394,7 +2456,7 @@ function WorkbenchNodeInspector({
         ((chosen.packet && !chosen.stage) || chosen.group) && h(Button, { onClick: () => expand(chosen) }, t(chosen.packet ? 'wbExpand' : 'wbExpandGroup')),
         ['delivery', 'merge'].includes(chosen.id) && h(DeliveryPanel, { control, selection, run, t }),
         binding && h('section', { className: css.inspectorSection }, h('h4', null, t('wbConfiguration')),
-          h('dl', { className: css.consoleProperties }, property(t('consoleProvider'), bindingCaption({ ...binding, model: '' })), property(t('consoleModel'), binding.model), property(t('consoleThinking'), ({off:'cfgEffortOff',minimal:'cfgEffortMinimal',low:'cfgEffortLow',medium:'cfgEffortMedium',high:'cfgEffortHigh',xhigh:'cfgEffortXhigh',max:'cfgEffortMax'})[binding.thinking] ? t(({off:'cfgEffortOff',minimal:'cfgEffortMinimal',low:'cfgEffortLow',medium:'cfgEffortMedium',high:'cfgEffortHigh',xhigh:'cfgEffortXhigh',max:'cfgEffortMax'})[binding.thinking]) : binding.thinking), property(t('permission'), permissionLabels[binding.permission] ? t(permissionLabels[binding.permission]) : binding.permission))),
+          h('dl', { className: css.consoleProperties }, property(t('consoleProvider'), bindingCaption({ ...binding, model: '' })), property(t('consoleModel'), binding.model), property(t('cfgNative'), binding['native-profile'] || binding.nativeProfile), property(t('consoleThinking'), ({off:'cfgEffortOff',minimal:'cfgEffortMinimal',low:'cfgEffortLow',medium:'cfgEffortMedium',high:'cfgEffortHigh',xhigh:'cfgEffortXhigh',max:'cfgEffortMax'})[binding.thinking] ? t(({off:'cfgEffortOff',minimal:'cfgEffortMinimal',low:'cfgEffortLow',medium:'cfgEffortMedium',high:'cfgEffortHigh',xhigh:'cfgEffortXhigh',max:'cfgEffortMax'})[binding.thinking]) : binding.thinking), property(t('permission'), permissionLabels[binding.permission] ? t(permissionLabels[binding.permission]) : binding.permission))),
         h('section', { className: css.inspectorSection }, h('h4', null, t('wbSession')),
           sessions.length ? sessions.map(([key, value]) => h('article', { key, className: css.sessionSummary },
             h('h4', null, (roleLabels[value.role] ? t(roleLabels[value.role]) : value.role) + ' · ' + value.scope),
@@ -3227,6 +3289,27 @@ function ConfigEditor({ control, selection, run, t, active = false, cache, conte
     else next[group][key][field] = value;
     replace(next);
   };
+  const nativeChoices = value => {
+    const inherited = draft.profiles?.[value.profile]?.['native-profile'];
+    const harness = value.harness || draft.profiles?.[value.profile]?.harness;
+    const choices = [['__inherit__', t('consoleInherit') + (inherited ? ' · ' + inherited : '')], ['', t('cfgNativeNone')],
+      ...Object.entries(draft['native-profiles'] ?? {}).filter(([, definition]) => definition.harness === harness).map(([name]) => [name, name])];
+    const selected = value['native-profile'];
+    if (selected && !choices.some(([name]) => name === selected)) choices.push([selected, selected]);
+    return choices;
+  };
+  const setNativeProfile = (value, name) => {
+    const next = { ...value };
+    if (name === '__inherit__') delete next['native-profile'];
+    else next['native-profile'] = name;
+    return next;
+  };
+  const inlineNativeProfile = (group, key, name) => {
+    const next = cloneConfig(draft);
+    if (group === 'panel') next['judge-panel'] = setNativeProfile(next['judge-panel'], name);
+    else next[group][key] = setNativeProfile(next[group][key], name);
+    replace(next);
+  };
   const saveBinding = () => {
     const { group, key, role, value, permission, session } = bindingEdit,
       next = cloneConfig(draft);
@@ -3363,7 +3446,7 @@ function ConfigEditor({ control, selection, run, t, active = false, cache, conte
     fields = h(React.Fragment, null,
       h('p', { className: css.meta }, t('cfgSessionDefault', { mode: t(draft.sessions?.mode === 'scoped' ? 'cfgReuse' : 'cfgFresh') })),
       h('div', { className: css.stageTableScroll }, h('table', { className: css.stageTable, 'aria-label': t('cfgModels') },
-        h('thead', null, h('tr', null, ...['cfgModelRole', 'consoleResource', 'consoleModel', 'consoleThinking', 'consoleSession'].map(key => h('th', { key, scope: 'col' }, t(key))))),
+        h('thead', null, h('tr', null, ...['cfgModelRole', 'consoleResource', 'consoleModel', 'consoleThinking', 'cfgNative', 'consoleSession'].map(key => h('th', { key, scope: 'col' }, t(key))))),
         h('tbody', null, ...rows.map(([group, key, value]) => {
           const role = group === 'routes' ? 'execute' : key;
           const sessionChoices = [['inherit', roleSession(role)], ['scoped', t('cfgReuse')], ['fresh', t('cfgFresh')]];
@@ -3374,9 +3457,11 @@ function ConfigEditor({ control, selection, run, t, active = false, cache, conte
             h('td', null, h(Button, { disabled: busy, onClick: () => openBinding(group, key, value), 'aria-label': t('cfgEdit') + ' ' + roleName(group, key) }, resourceNames[resourceOf(value)])),
             h('td', null, h('input', { className: css.editorInput, value: value.model ?? '', placeholder: value.profile || t('cfgEffortDefault'), disabled: busy, 'aria-label': roleName(group, key) + ' · ' + t('consoleModel'), onChange: e => inlineBinding(group, key, 'model', e.target.value) })),
             h('td', null, h('select', { className: css.modeSelect, value: value.thinking ?? '', disabled: busy, 'aria-label': roleName(group, key) + ' · ' + t('consoleThinking'), onChange: e => inlineBinding(group, key, 'thinking', e.target.value) }, ...[...new Set([...Object.keys(efforts), value.thinking ?? ''])].map(effort => h('option', { key: effort, value: effort }, efforts[effort] ?? effort)))),
+            h('td', null, h('select', { className: css.modeSelect, disabled: busy, value: value['native-profile'] ?? '__inherit__', 'aria-label': roleName(group, key) + ' · ' + t('cfgNative'), onChange: e => inlineNativeProfile(group, key, e.target.value) }, ...nativeChoices(value).map(([name, label]) => h('option', { key: name, value: name }, label)))),
             h('td', null, ['intake', 'garden'].includes(role) ? t('cfgIndependent') : h('select', { className: css.modeSelect, disabled: busy, value: draft.sessions?.roles?.[role] ?? 'inherit', 'aria-label': roleName(group, key) + ' · ' + t('consoleSession'), onChange: e => inlineBinding(group, key, 'session', e.target.value) }, ...sessionChoices.map(([v, label]) => h('option', { key: v, value: v }, label))), planConflict && h('div', { className: css.settingsHelp }, t('cfgPlanConflict'), h(Button, { disabled: busy, onClick: () => inlineBinding(group, key, 'session', policy) }, t('cfgApplyPolicy')))));
         })))),
-      h('p', { className: css.settingsHelp }, t('consoleRouteSession')));
+      h('p', { className: css.settingsHelp }, t('consoleRouteSession')),
+      h('p', { className: css.settingsHelp }, t('cfgNativeHelp')));
   if (draft && section === 'jev')
     fields = h(
       React.Fragment,
@@ -3689,6 +3774,9 @@ function ConfigEditor({ control, selection, run, t, active = false, cache, conte
             },
           ),
         ),
+        field('binding.native-profile', t('cfgNative'), t('cfgNativeHelp'),
+          select('binding.native-profile', bindingEdit.value['native-profile'] ?? '__inherit__', nativeChoices(bindingEdit.value),
+            name => setBindingEdit(old => ({ ...old, value: setNativeProfile(old.value, name) })))),
         field(
           'binding.permission',
           t('permission'),
@@ -3769,6 +3857,15 @@ Object.assign(en, {
 Object.assign(zh, { cfgPlanConflict: 'Plan 旧历史开关与此策略不同', cfgApplyPolicy: '同步此策略' });
 Object.assign(en, { cfgPlanConflict: 'The legacy Plan history switch differs', cfgApplyPolicy: 'Align policy' });
 
+Object.assign(zh, {
+  cfgNative: '原生能力', cfgNativeNone: '不启用原生能力配置',
+  cfgNativeHelp: '选择与当前后端匹配的能力配置；在高级 JSON 中编辑 native-profiles。JEV 关闭时仍生效，实际可用性以运行回执为准。',
+});
+Object.assign(en, {
+  cfgNative: 'Native capabilities', cfgNativeNone: 'No native capability profile',
+  cfgNativeHelp: 'Select a profile for this backend; edit native-profiles in advanced JSON. Profiles work with JEV off. Runtime receipts establish actual availability.',
+});
+
 Object.assign(zh, {
   runsDetails: '运行详情',
   runsNoReference: '不设置对照',

package/dist/codex-pro-bridge.mjs

@@ -1,8 +1,9 @@
 // Public machine API consumer. Go remains the owner of scheduling and acceptance.
 import { createRequire } from 'node:module';
 import { isAbsolute } from 'node:path';
+import { validateNativeAdmission } from './machine-worker.mjs';
 
-export const ADAPTER = Object.freeze({ package: 'dsh-subagent-codex-pro', version: '0.9.0', protocol: 1 });
+export const ADAPTER = Object.freeze({ package: 'dsh-subagent-codex-pro', version: '0.10.0', protocol: 1 });
 export const LIMITS = Object.freeze({ requestBytes: 1024 * 1024, machineOutputBytes: 1024 * 1024,
   progressBytes: 1024 * 1024, receiptFrameBytes: 8 * 1024 * 1024, admissionMs: 10000 });
 const require = createRequire(import.meta.url);
@@ -20,7 +21,7 @@ export async function loadAdapter() {
   try {
     manifest = require('dsh-subagent-codex-pro/package.json');
   } catch {
-    throw new WorkerError('ADAPTER_UNAVAILABLE', 'Install the exact dsh-subagent-codex-pro@0.9.0 dependency with Flywheel');
+    throw new WorkerError('ADAPTER_UNAVAILABLE', 'Install the exact dsh-subagent-codex-pro@0.10.0 dependency with Flywheel');
   }
   if (manifest.name !== ADAPTER.package || manifest.version !== ADAPTER.version) {
     throw new WorkerError('ADAPTER_MISMATCH', 'Codex Pro package identity or version does not match the pinned contract');
@@ -31,7 +32,9 @@ export async function loadAdapter() {
       typeof api.parseMachineRequest !== 'function' || typeof api.runMachine !== 'function' || typeof api.MachineInputError !== 'function' ||
       api.MACHINE_LIFECYCLE_VERSION !== 1 || typeof api.recoverMachine !== 'function' ||
       api.MACHINE_LIFECYCLE_CAPABILITIES?.durableJournal !== true || api.MACHINE_LIFECYCLE_CAPABILITIES?.readOnlyRecovery !== true ||
-      api.MACHINE_LIFECYCLE_CAPABILITIES?.threadReadyBeforeDispatch !== true) {
+      api.MACHINE_LIFECYCLE_CAPABILITIES?.threadReadyBeforeDispatch !== true ||
+      api.MACHINE_NATIVE_VERSION !== 1 || api.MACHINE_NATIVE_CAPABILITIES?.version !== 1 ||
+      api.MACHINE_NATIVE_CAPABILITIES?.agents !== true || api.MACHINE_NATIVE_CAPABILITIES?.review !== true) {
     throw new WorkerError('ADAPTER_MISMATCH', 'Codex Pro package identity, version or public machine API does not match the pinned contract');
   }
   return api;
@@ -41,7 +44,7 @@ export async function loadAdapter() {
 export function machineRequest(value, api, env) {
   const lifecycle = value?.protocol === 3;
   const persistent = value?.protocol === 2 || (lifecycle && value.threadMode === 'persistent');
-  const keys = new Set(['type', 'protocol', 'requestId', 'cwd', 'model', 'reasoningEffort', 'permissionMode', 'prompt', 'timeoutMs',
+  const keys = new Set(['type', 'protocol', 'requestId', 'cwd', 'model', 'reasoningEffort', 'permissionMode', 'prompt', 'timeoutMs', 'native', 'managed', 'images', 'outputSchema',
     ...(persistent || lifecycle ? ['threadMode', 'threadId'] : []), ...(lifecycle ? ['recoveryDirectory'] : [])]);
   if (value === null || typeof value !== 'object' || Array.isArray(value) || value.type !== 'start' || ![1, 2, 3].includes(value.protocol) ||
       Object.keys(value).some(key => !keys.has(key)) || typeof value.requestId !== 'string' || value.requestId.length > 256 ||
@@ -56,11 +59,15 @@ export function machineRequest(value, api, env) {
   if (value.timeoutMs !== undefined && (!Number.isSafeInteger(value.timeoutMs) || value.timeoutMs < 1 || value.timeoutMs > 2147483647)) {
     throw new WorkerError('INVALID_REQUEST', 'timeoutMs must be a positive safe integer no greater than 2147483647');
   }
+  validateNativeAdmission(value.managed, value.requestId, WorkerError);
   try {
     return api.parseMachineRequest({ protocol: 1, requestId: value.requestId, cwd: value.cwd, model: value.model,
       effort: value.reasoningEffort,
       permissionMode: value.permissionMode === 'danger-full-access' ? 'dangerously-bypass-approvals-and-sandbox' : value.permissionMode,
       prompt: value.prompt,
+      ...(value.native === undefined ? {} : { native: value.native }),
+      ...(value.images === undefined ? {} : { images: value.images }),
+      ...(value.outputSchema === undefined ? {} : { outputSchema: value.outputSchema }),
       ...(value.timeoutMs === undefined ? {} : { timeoutMs: value.timeoutMs }),
       command: env.FLYWHEEL_CODEX_BIN || 'codex', threadMode: persistent ? 'persistent' : 'ephemeral',
       ...(persistent && value.threadId !== undefined ? { threadId: value.threadId } : {}), maxOutputBytes: LIMITS.machineOutputBytes });
@@ -71,5 +78,5 @@ export function machineRequest(value, api, env) {
 
 export function doctorResult() {
   return { protocol: 1, type: 'doctor', package: ADAPTER.package, version: ADAPTER.version,
-    machineProtocol: ADAPTER.protocol, available: true, inferenceTested: false };
+    machineProtocol: ADAPTER.protocol, nativeVersion: 1, available: true, inferenceTested: false };
 }

package/dist/control.mjs

@@ -73,7 +73,7 @@ function validConfiguration(value) {
     Array.isArray(value.bindings) && value.bindings.every(binding => record(binding) &&
       ['id', 'role', 'harness'].every(key =>
         typeof binding[key] === 'string' && binding[key].trim() !== '') &&
-      ['route', 'profile', 'provider', 'channel', 'model', 'thinking', 'permissionMode'].every(key =>
+      ['route', 'profile', 'nativeProfile', 'provider', 'channel', 'model', 'thinking', 'permissionMode'].every(key =>
         binding[key] === undefined || typeof binding[key] === 'string') &&
       ['residentSession', 'inScope'].every(key => binding[key] === undefined || typeof binding[key] === 'boolean'));
 }