cli-jaw 2.0.5 → 2.0.6

package/public/manager/src/settings/pages/Agent.tsx

@@ -50,6 +50,7 @@ type FlushSnapshot = {
 
 type RuntimeDraft = {
     cli: string;
+    provider: string;
     model: string;
     effort: string;
     workingDir: string;
@@ -60,6 +61,7 @@ export default function Agent({ port, client, dirty, registerSave }: SettingsPag
     const { state, refresh, setData } = usePageSnapshot<AgentSnapshot>(client, '/api/settings');
     const [draft, setDraft] = useState<RuntimeDraft>({
         cli: '',
+        provider: '',
         model: '',
         effort: '',
         workingDir: '',
@@ -116,6 +118,7 @@ export default function Agent({ port, client, dirty, registerSave }: SettingsPag
         const permissions = parsePermissionsValue(state.data.permissions);
         setDraft({
             cli,
+            provider: state.data.perCli?.[cli]?.provider || metaFor(cli).defaultProvider || '',
             model: runtimeModelFor(cli, state.data.perCli, state.data.activeOverrides),
             effort: runtimeEffortFor(cli, state.data.perCli, state.data.activeOverrides),
             workingDir: state.data.workingDir || '',
@@ -165,6 +168,13 @@ export default function Agent({ port, client, dirty, registerSave }: SettingsPag
     const activeOverrides = settingsData.activeOverrides || {};
     const cliOptions = useMemo(() => Object.keys(perCli), [perCli]);
     const activeMeta = metaFor(draft.cli);
+    const activeProvider = draft.provider || activeMeta.defaultProvider || activeMeta.providers?.[0] || '';
+    const activeModelOptions = draft.cli === 'ai-e'
+        ? optionList(activeMeta.modelsByProvider?.[activeProvider] || activeMeta.models, draft.model)
+        : optionList(activeMeta.models, draft.model);
+    const activeEffortOptions = draft.cli === 'ai-e'
+        ? (activeMeta.effortsByProvider?.[activeProvider] || activeMeta.efforts)
+        : activeMeta.efforts;
     const workingDirError = draft.workingDir.trim() ? null : 'Required';
 
     if (state.kind === 'loading') return <PageLoading />;
@@ -192,16 +202,19 @@ export default function Agent({ port, client, dirty, registerSave }: SettingsPag
             <RuntimeHeader
                 cli={draft.cli}
                 cliOptions={cliOptions.length > 0 ? cliOptions : [draft.cli || 'claude']}
+                provider={activeProvider}
+                providerOptions={activeMeta.providers || []}
                 model={draft.model}
-                modelOptions={optionList(activeMeta.models, draft.model)}
+                modelOptions={activeModelOptions}
                 effort={draft.effort}
-                effortOptions={activeMeta.efforts}
+                effortOptions={activeEffortOptions}
                 workingDir={draft.workingDir}
                 workingDirError={workingDirError}
                 onCliChange={(next) => {
                     const nextDraft = {
                         ...draft,
                         cli: next,
+                        provider: perCli[next]?.provider || metaFor(next).defaultProvider || '',
                         model: runtimeModelFor(next, perCli, activeOverrides),
                         effort: runtimeEffortFor(next, perCli, activeOverrides),
                     };
@@ -209,6 +222,28 @@ export default function Agent({ port, client, dirty, registerSave }: SettingsPag
                     setRuntimeDraft(nextDraft);
                     setEntry('cli', { value: next, original: settingsData.cli || '', valid: true });
                 }}
+                onProviderChange={(next) => {
+                    const models = activeMeta.modelsByProvider?.[next] || [];
+                    const efforts = activeMeta.effortsByProvider?.[next] || [];
+                    const nextModel = models.includes(draft.model) ? draft.model : (models[0] || '');
+                    const nextEffort = efforts.includes(draft.effort) ? draft.effort : '';
+                    setRuntimeDraft({ ...draft, provider: next, model: nextModel, effort: nextEffort });
+                    setEntry('perCli.ai-e.provider', {
+                        value: next,
+                        original: perCli['ai-e']?.provider || activeMeta.defaultProvider || 'claude',
+                        valid: true,
+                    });
+                    setEntry('activeOverrides.ai-e.model', {
+                        value: nextModel,
+                        original: runtimeModelFor('ai-e', perCli, activeOverrides),
+                        valid: nextModel.trim().length > 0,
+                    });
+                    setEntry('activeOverrides.ai-e.effort', {
+                        value: nextEffort,
+                        original: runtimeEffortFor('ai-e', perCli, activeOverrides),
+                        valid: true,
+                    });
+                }}
                 onModelChange={(next) => {
                     setRuntimeDraft({ ...draft, model: next });
                     setEntry(`activeOverrides.${draft.cli}.model`, {

package/public/manager/src/settings/pages/Heartbeat.tsx

@@ -35,6 +35,7 @@ import {
     validateHHMM,
     validateInterval,
 } from './components/heartbeat-helpers';
+import { metaFor } from './components/agent/agent-meta';
 
 // Re-export helpers (and types) that tests import from this module.
 export {
@@ -159,10 +160,10 @@ export default function Heartbeat({ port, client, dirty, registerSave }: Setting
     const targetSource = cliKeys.length > 0 ? cliKeys : [...TARGET_FALLBACK];
     const targetOptions = [
         { value: 'all', label: 'all (broadcast)' },
-        ...targetSource.map((cli) => ({ value: cli, label: cli })),
+        ...targetSource.map((cli) => ({ value: cli, label: metaFor(cli).label || cli })),
     ];
     if (!targetOptions.some((opt) => opt.value === hbTarget)) {
-        targetOptions.push({ value: hbTarget, label: `${hbTarget} (legacy)` });
+        targetOptions.push({ value: hbTarget, label: `${metaFor(hbTarget).label || hbTarget} (legacy)` });
     }
 
     return (

package/public/manager/src/settings/pages/Memory.tsx

@@ -35,6 +35,7 @@ import {
     type MemoryBlock,
     type MemoryEntry,
 } from './components/memory-helpers';
+import { metaFor } from './components/agent/agent-meta';
 
 // Re-export pure helpers for unit tests (Heartbeat pattern).
 export {
@@ -211,10 +212,10 @@ export default function Memory({ port, client, dirty, registerSave }: SettingsPa
     const cliKeys = Object.keys(perCli);
     const cliOptions = [
         { value: '', label: '(profile default)' },
-        ...cliKeys.map((c) => ({ value: c, label: c })),
+        ...cliKeys.map((c) => ({ value: c, label: metaFor(c).label || c })),
     ];
     if (cli && !cliOptions.some((opt) => opt.value === cli)) {
-        cliOptions.push({ value: cli, label: `${cli} (legacy)` });
+        cliOptions.push({ value: cli, label: `${metaFor(cli).label || cli} (legacy)` });
     }
 
     const allRows =

package/public/manager/src/settings/pages/components/EmployeeRow.tsx

@@ -7,6 +7,7 @@ import { useId } from 'react';
 import { TextField, ToggleField, SelectField } from '../../fields';
 import type { EmployeeRecord } from './employees-helpers';
 import { DEFAULT_CLI_OPTIONS } from './employees-helpers';
+import { metaFor } from './agent/agent-meta';
 
 type Props = {
     employee: EmployeeRecord;
@@ -36,10 +37,13 @@ export function EmployeeRow({
         ...DEFAULT_CLI_OPTIONS,
     ]);
     if (employee.cli) baseSet.add(employee.cli);
-    const opts = Array.from(baseSet).map((value) => ({
-        value,
-        label: cliOptions.includes(value) ? value : `${value} (legacy)`,
-    }));
+    const opts = Array.from(baseSet).map((value) => {
+        const label = metaFor(value).label || value;
+        return {
+            value,
+            label: cliOptions.includes(value) ? label : `${label} (legacy)`,
+        };
+    });
 
     const dupeError = duplicateName ? 'Another employee already uses this name' : null;
     const renderedNameError = nameError ?? dupeError;

package/public/manager/src/settings/pages/components/PerCliRow.tsx

@@ -19,11 +19,37 @@ function entryFor(value: unknown, original: unknown, valid = true): DirtyEntry {
 
 export function PerCliRow({ cli, meta, original, value, setValue, setEntry }: Props) {
     const modelDatalistId = `percli-${cli}-models`;
+    const isAiE = cli === 'ai-e';
+    const provider = value.provider || meta.defaultProvider || meta.providers?.[0] || 'claude';
+    const modelOptions = isAiE
+        ? (meta.modelsByProvider?.[provider] ?? meta.models)
+        : meta.models;
+    const effortOptions = isAiE
+        ? (meta.effortsByProvider?.[provider] ?? meta.efforts)
+        : meta.efforts;
 
     return (
         <div className="settings-percli-row" data-cli={cli}>
             <h3 className="settings-percli-title">{meta.label}</h3>
             <div className="settings-percli-grid">
+                {isAiE && meta.providers?.length ? (
+                    <SelectField
+                        id={`percli-${cli}-provider`}
+                        label="Provider"
+                        value={provider}
+                        options={meta.providers.map((p) => ({ value: p, label: p }))}
+                        onChange={(next) => {
+                            const nextModels = meta.modelsByProvider?.[next] ?? [];
+                            const nextEfforts = meta.effortsByProvider?.[next] ?? [];
+                            const nextModel = nextModels.includes(value.model || '') ? (value.model || '') : (nextModels[0] || '');
+                            const nextEffort = nextEfforts.includes(value.effort || '') ? (value.effort || '') : '';
+                            setValue({ ...value, provider: next, model: nextModel, effort: nextEffort });
+                            setEntry(`perCli.${cli}.provider`, entryFor(next, original.provider ?? meta.defaultProvider ?? 'claude'));
+                            setEntry(`perCli.${cli}.model`, entryFor(nextModel, original.model ?? ''));
+                            setEntry(`perCli.${cli}.effort`, entryFor(nextEffort, original.effort ?? ''));
+                        }}
+                    />
+                ) : null}
                 <div className="settings-percli-model">
                     <TextField
                         id={`percli-${cli}-model`}
@@ -33,24 +59,24 @@ export function PerCliRow({ cli, meta, original, value, setValue, setEntry }: Pr
                             setValue({ ...value, model: next });
                             setEntry(`perCli.${cli}.model`, entryFor(next, original.model ?? ''));
                         }}
-                        placeholder={meta.models[0] ?? 'model id'}
+                        placeholder={modelOptions[0] ?? 'model id'}
                     />
-                    {meta.models.length > 0 ? (
+                    {modelOptions.length > 0 ? (
                         <datalist id={modelDatalistId}>
-                            {meta.models.map((m) => (
+                            {modelOptions.map((m) => (
                                 <option key={m} value={m} />
                             ))}
                         </datalist>
                     ) : null}
                 </div>
-                {meta.efforts.length > 0 ? (
+                {effortOptions.length > 0 ? (
                     <SelectField
                         id={`percli-${cli}-effort`}
                         label="Effort"
                         value={value.effort ?? ''}
                         options={[
                             { value: '', label: '(default)' },
-                            ...meta.efforts.map((e) => ({ value: e, label: e })),
+                            ...effortOptions.map((e) => ({ value: e, label: e })),
                         ]}
                         onChange={(next) => {
                             setValue({ ...value, effort: next });

package/public/manager/src/settings/pages/components/agent/FlushAgentSection.tsx

@@ -1,5 +1,6 @@
 import { SelectField } from '../../../fields';
 import { SettingsSection } from '../../page-shell';
+import { metaFor } from './agent-meta';
 
 type FlushAgentSectionProps = {
     activeCli: string;
@@ -25,6 +26,7 @@ export function FlushAgentSection({
     onFlushModelChange,
 }: FlushAgentSectionProps) {
     const effectiveCli = flushCli || activeCli;
+    const effectiveCliLabel = effectiveCli ? metaFor(effectiveCli).label || effectiveCli : 'active';
     return (
         <SettingsSection
             title="Flush Agent"
@@ -33,7 +35,7 @@ export function FlushAgentSection({
             <details className="settings-agent-flush">
                 <summary>
                     <span>Flush runtime</span>
-                    <code>{effectiveCli || 'active'}{flushModel && flushModel !== 'default' ? ` / ${flushModel}` : ''}</code>
+                    <code>{effectiveCliLabel}{flushModel && flushModel !== 'default' ? ` / ${flushModel}` : ''}</code>
                 </summary>
                 {loading ? <p className="settings-agent-note">Loading flush settings...</p> : null}
                 {error ? <p className="settings-field-error" role="alert">{error}</p> : null}
@@ -44,7 +46,7 @@ export function FlushAgentSection({
                         value={flushCli}
                         options={[
                             { value: '', label: '(active CLI)' },
-                            ...cliOptions.map((value) => ({ value, label: value })),
+                            ...cliOptions.map((value) => ({ value, label: metaFor(value).label || value })),
                         ]}
                         onChange={onFlushCliChange}
                     />

package/public/manager/src/settings/pages/components/agent/RuntimeEmployeeRow.tsx

@@ -47,7 +47,7 @@ export function RuntimeEmployeeRow({
                     label="CLI"
                     value={employee.cli}
                     disabled={locked}
-                    options={cliChoices.map((value) => ({ value, label: value }))}
+                    options={cliChoices.map((value) => ({ value, label: metaFor(value).label || value }))}
                     onChange={(next) => {
                         const nextModel = metaFor(next).models[0] || 'default';
                         onChange({ cli: next, model: nextModel });

package/public/manager/src/settings/pages/components/agent/RuntimeHeader.tsx

@@ -1,9 +1,12 @@
 import { SelectField, TextField } from '../../../fields';
 import { SettingsSection } from '../../page-shell';
+import { metaFor, PRIMARY_CLIS } from './agent-meta';
 
 type RuntimeHeaderProps = {
     cli: string;
     cliOptions: ReadonlyArray<string>;
+    provider?: string;
+    providerOptions?: ReadonlyArray<string>;
     model: string;
     modelOptions: ReadonlyArray<{ value: string; label: string }>;
     effort: string;
@@ -11,6 +14,7 @@ type RuntimeHeaderProps = {
     workingDir: string;
     workingDirError: string | null;
     onCliChange(next: string): void;
+    onProviderChange?(next: string): void;
     onModelChange(next: string): void;
     onEffortChange(next: string): void;
     onWorkingDirChange(next: string): void;
@@ -19,6 +23,8 @@ type RuntimeHeaderProps = {
 export function RuntimeHeader({
     cli,
     cliOptions,
+    provider = '',
+    providerOptions = [],
     model,
     modelOptions,
     effort,
@@ -26,6 +32,7 @@ export function RuntimeHeader({
     workingDir,
     workingDirError,
     onCliChange,
+    onProviderChange,
     onModelChange,
     onEffortChange,
     onWorkingDirChange,
@@ -40,9 +47,24 @@ export function RuntimeHeader({
                     id="agent-cli"
                     label="Active CLI"
                     value={cli}
-                    options={cliOptions.map((value) => ({ value, label: value }))}
+                    options={[
+                        ...cliOptions.filter((v) => PRIMARY_CLIS.includes(v))
+                            .map((v) => ({ value: v, label: metaFor(v).label || v })),
+                        ...cliOptions.filter((v) => !PRIMARY_CLIS.includes(v))
+                            .map((v) => ({ value: v, label: metaFor(v).label || v })),
+                    ]}
+                    collapsedAfter={cliOptions.filter((v) => PRIMARY_CLIS.includes(v)).length}
                     onChange={onCliChange}
                 />
+                {cli === 'ai-e' && providerOptions.length > 0 ? (
+                    <SelectField
+                        id="agent-ai-e-provider"
+                        label="AI-E provider"
+                        value={provider}
+                        options={providerOptions.map((value) => ({ value, label: value }))}
+                        onChange={(next) => onProviderChange?.(next)}
+                    />
+                ) : null}
                 <SelectField
                     id="agent-model"
                     label="Active model"

package/public/manager/src/settings/pages/components/agent/agent-meta.ts

@@ -2,9 +2,15 @@ export type CliMeta = {
     label: string;
     models: ReadonlyArray<string>;
     efforts: ReadonlyArray<string>;
+    defaultProvider?: string;
+    providers?: ReadonlyArray<string>;
+    modelsByProvider?: Record<string, ReadonlyArray<string>>;
+    effortsByProvider?: Record<string, ReadonlyArray<string>>;
+    effortNote?: string;
 };
 
 export type PerCliEntry = {
+    provider?: string;
     model?: string;
     effort?: string;
     fastMode?: boolean;
@@ -14,11 +20,35 @@ export type PerCliEntry = {
 };
 
 export type ActiveOverride = {
+    provider?: string;
     model?: string;
     effort?: string;
 };
 
+export const PRIMARY_CLIS: ReadonlyArray<string> = ['claude', 'codex', 'gemini'];
+
 export const CLI_META: Record<string, CliMeta> = {
+    'ai-e': {
+        label: 'AI-E',
+        defaultProvider: 'claude',
+        providers: ['claude', 'codex', 'gemini', 'grok', 'copilot'],
+        models: ['opus', 'sonnet', 'haiku', 'gpt-5.4', 'gpt-5.4-mini', 'gemini-3-flash-preview', 'grok-build', 'gpt-5-mini'],
+        efforts: ['low', 'medium', 'high', 'xhigh', 'max'],
+        modelsByProvider: {
+            claude: ['opus', 'sonnet', 'haiku'],
+            codex: ['gpt-5.4', 'gpt-5.4-mini'],
+            gemini: ['gemini-3-flash-preview'],
+            grok: ['grok-build'],
+            copilot: ['gpt-5-mini'],
+        },
+        effortsByProvider: {
+            claude: ['low', 'medium', 'high', 'xhigh', 'max'],
+            codex: ['low', 'medium', 'high', 'xhigh'],
+            gemini: [],
+            grok: [],
+            copilot: ['low', 'medium', 'high'],
+        },
+    },
     claude: {
         label: 'Claude',
         // Aliases + pinned full IDs (hyphen form — Anthropic API rejects
@@ -44,16 +74,35 @@ export const CLI_META: Record<string, CliMeta> = {
         ],
         efforts: ['low', 'medium', 'high', 'xhigh', 'max'],
     },
+    'claude-e': {
+        label: 'Claude E',
+        models: [
+            'opus', 'sonnet', 'haiku',
+            'claude-opus-4-7', 'claude-sonnet-4-6', 'claude-haiku-4-5',
+        ],
+        efforts: ['low', 'medium', 'high', 'xhigh', 'max'],
+    },
     codex: {
         label: 'Codex',
         models: ['gpt-5.5', 'gpt-5.4', 'gpt-5.4-mini', 'gpt-5.3-codex'],
         efforts: ['low', 'medium', 'high', 'xhigh'],
     },
+    'codex-app': {
+        label: 'Codex App',
+        models: ['gpt-5.5', 'gpt-5.4', 'gpt-5.4-mini', 'gpt-5.3-codex'],
+        efforts: ['low', 'medium', 'high', 'xhigh'],
+    },
     gemini: {
         label: 'Gemini',
         models: ['gemini-3-pro-preview', 'gemini-2.5-pro', 'gemini-3-flash-preview'],
         efforts: [],
     },
+    grok: {
+        label: 'Grok',
+        models: ['grok-build'],
+        efforts: [],
+        effortNote: 'unsupported by grok-build; do not pass --effort',
+    },
     opencode: {
         label: 'OpenCode',
         models: ['opencode-go/kimi-k2.6', 'opencode-go/glm-5.1'],

package/public/manager/src/settings/pages/components/employees-helpers.ts

@@ -12,10 +12,15 @@ export type EmployeeRecord = {
 export const EMPLOYEE_KEYS = ['employees'] as const;
 
 export const DEFAULT_CLI_OPTIONS = [
-    'codex',
+    'ai-e',
     'claude',
+    'claude-e',
+    'codex',
+    'codex-app',
     'copilot',
     'gemini',
+    'grok',
+    'opencode',
 ] as const;
 
 let counter = 0;

package/public/manager/src/settings/pages/components/heartbeat-helpers.ts

@@ -13,7 +13,17 @@ export type { HbJob, HbSchedule, HbScheduleEvery, HbScheduleCron };
 
 const INTERVAL_RE = /^\d+[smh]$/;
 const HHMM_RE = /^([01]\d|2[0-3]):[0-5]\d$/;
-export const TARGET_FALLBACK = ['codex', 'claude', 'copilot', 'gemini'] as const;
+export const TARGET_FALLBACK = [
+    'ai-e',
+    'claude',
+    'claude-e',
+    'codex',
+    'codex-app',
+    'copilot',
+    'gemini',
+    'grok',
+    'opencode',
+] as const;
 
 export const SECTION_A_KEYS = [
     'heartbeat.enabled',

package/public/manager/src/settings-controls.css

@@ -142,6 +142,31 @@
     font-weight: 600;
 }
 
+.settings-select-divider {
+    border: 0;
+    border-top: 1px solid var(--border-subtle, var(--border-strong));
+    margin: 4px 8px;
+}
+
+.settings-select-more {
+    width: 100%;
+    min-height: 28px;
+    border: 0;
+    border-radius: 5px;
+    background: transparent;
+    padding: 5px 9px;
+    color: var(--text-secondary, var(--text-primary));
+    font-size: 0.85em;
+    cursor: pointer;
+    text-align: left;
+    opacity: 0.7;
+}
+
+.settings-select-more:hover {
+    background: var(--surface-raised);
+    opacity: 1;
+}
+
 @media (max-width: 720px) {
     .settings-field-select,
     .settings-select-menu {

package/public/manager/src/usePreviewShortcutMessages.ts

@@ -0,0 +1,30 @@
+import { useEffect } from 'react';
+import { actionForShortcutEvent } from './manager-shortcuts';
+import type { DashboardShortcutAction, DashboardShortcutKeymap } from './types';
+
+type PreviewShortcutMessageArgs = {
+    enabled: boolean;
+    keymap: DashboardShortcutKeymap;
+    onAction: (action: DashboardShortcutAction) => void;
+};
+
+export function usePreviewShortcutMessages(args: PreviewShortcutMessageArgs): void {
+    useEffect(() => {
+        function onPreviewShortcut(event: MessageEvent): void {
+            if (!args.enabled) return;
+            const data = event.data as { type?: unknown; key?: unknown; altKey?: unknown; shiftKey?: unknown } | null;
+            if (!data || data.type !== 'jaw-preview-shortcut') return;
+            const synth = {
+                key: data.key,
+                altKey: !!data.altKey,
+                ctrlKey: false,
+                metaKey: false,
+                shiftKey: !!data.shiftKey,
+            } as unknown as KeyboardEvent;
+            const action = actionForShortcutEvent(synth, args.keymap);
+            if (action) args.onAction(action);
+        }
+        window.addEventListener('message', onPreviewShortcut);
+        return () => window.removeEventListener('message', onPreviewShortcut);
+    }, [args]);
+}

package/public/manager/src/usePreviewSttLifecycle.ts

@@ -0,0 +1,31 @@
+import { useEffect } from 'react';
+import type { JawCeoVoiceController } from './jaw-ceo/useJawCeoVoice';
+
+function isLocalPreviewMessageOrigin(origin: string): boolean {
+    if (origin === window.location.origin) return true;
+    try {
+        const hostname = new URL(origin).hostname;
+        return hostname === 'localhost'
+            || hostname === '127.0.0.1'
+            || hostname === '::1'
+            || hostname === '[::1]';
+    } catch {
+        return false;
+    }
+}
+
+export function usePreviewSttLifecycle(voice: Pick<JawCeoVoiceController, 'status' | 'end'>): void {
+    useEffect(() => {
+        function onPreviewSttLifecycle(event: MessageEvent): void {
+            const data = event.data as { type?: unknown; action?: unknown } | null;
+            if (data?.type !== 'jaw-preview-stt-recording') return;
+            if (data.action !== 'request') return;
+            if (!isLocalPreviewMessageOrigin(event.origin)) return;
+            if (voice.status === 'active' || voice.status === 'silent' || voice.status === 'paused' || voice.status === 'connecting') {
+                void voice.end();
+            }
+        }
+        window.addEventListener('message', onPreviewSttLifecycle);
+        return () => window.removeEventListener('message', onPreviewSttLifecycle);
+    }, [voice.status, voice.end]);
+}

package/scripts/fresh-install-smoke.ts

@@ -106,7 +106,7 @@ async function main(): Promise<void> {
         if (!cliRes.ok) throw new Error(`/api/cli-status HTTP ${cliRes.status}`);
         const cliJson = (await cliRes.json()) as Record<string, unknown> | null;
         const keys = Object.keys(cliJson ?? {});
-        const required: string[] = ['claude', 'codex', 'gemini', 'copilot', 'opencode'];
+        const required: string[] = ['ai-e', 'claude', 'claude-e', 'codex', 'codex-app', 'copilot', 'gemini', 'grok', 'opencode'];
         for (const k of required) {
             if (!keys.includes(k)) throw new Error(`missing cli key in status: ${k}`);
         }

package/scripts/install-officecli.ps1

@@ -26,6 +26,7 @@ if ($Upstream) {
 $installDir = Join-Path $env:LOCALAPPDATA "OfficeCli"
 $targetBin = Join-Path $installDir "officecli.exe"
 $downloadBin = Join-Path $installDir "officecli.download.exe"
+$sidecarDownload = Join-Path $installDir "officecli-sidecar.download.exe"
 
 $arch = [System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant()
 switch ($arch) {
@@ -49,9 +50,14 @@ Write-Info "Platform: win32/$arch -> $asset"
 if ((Test-Path $targetBin) -and -not $Force -and -not $Update) {
   try {
     $current = & $targetBin --version 2>$null
-    Write-Ok "officecli already installed: v$($current.Trim())"
-    Write-Host "  Use -Force to reinstall or -Update to refresh only when outdated"
-    exit 0
+    $fieldBridge = Join-Path $installDir "rhwp-field-bridge.exe"
+    $officeBridge = Join-Path $installDir "rhwp-officecli-bridge.exe"
+    if ((Test-Path $fieldBridge) -and (Test-Path $officeBridge)) {
+      Write-Ok "officecli already installed: v$($current.Trim())"
+      Write-Host "  Use -Force to reinstall or -Update to refresh only when outdated"
+      exit 0
+    }
+    Write-Warn "officecli is installed, but HWP sidecars are missing; refreshing installation"
   } catch {
     Write-Warn "Existing officecli is not executable; reinstalling"
   }
@@ -63,8 +69,14 @@ if ((Test-Path $targetBin) -and -not $Force -and $Update) {
   try { $current = & $targetBin --version 2>$null } catch { }
   try { $latest = Get-LatestTag $Repo } catch { }
   if ($current -and $latest -and (Normalize-Version $current) -eq (Normalize-Version $latest)) {
-    Write-Ok "officecli already up to date: v$(Normalize-Version $current)"
-    exit 0
+    $fieldBridge = Join-Path $installDir "rhwp-field-bridge.exe"
+    $officeBridge = Join-Path $installDir "rhwp-officecli-bridge.exe"
+    if (-not ((Test-Path $fieldBridge) -and (Test-Path $officeBridge))) {
+      Write-Warn "officecli is current, but HWP sidecars are missing; refreshing installation"
+    } else {
+      Write-Ok "officecli already up to date: v$(Normalize-Version $current)"
+      exit 0
+    }
   }
   if ($current -and $latest) {
     Write-Info "Updating officecli v$(Normalize-Version $current) -> v$(Normalize-Version $latest)"
@@ -89,6 +101,22 @@ try {
 Move-Item -Force $downloadBin $targetBin
 Write-Ok "officecli v$version installed -> $targetBin"
 
+$assetBase = $asset -replace '\.exe$', ''
+foreach ($sidecar in @("rhwp-field-bridge", "rhwp-officecli-bridge")) {
+  $sidecarAsset = "$assetBase-$sidecar.exe"
+  $sidecarUrl = "https://github.com/$Repo/releases/latest/download/$sidecarAsset"
+  $sidecarTarget = Join-Path $installDir "$sidecar.exe"
+  Write-Info "Checking optional HWP sidecar $sidecarAsset..."
+  try {
+    Invoke-WebRequest -Uri $sidecarUrl -OutFile $sidecarDownload
+    Move-Item -Force $sidecarDownload $sidecarTarget
+    Write-Ok "HWP sidecar installed -> $sidecarTarget"
+  } catch {
+    Remove-Item -Force $sidecarDownload -ErrorAction SilentlyContinue
+    Write-Warn "Optional HWP sidecar unavailable: $sidecarAsset. Binary .hwp create/read/edit will be dependency-gated."
+  }
+}
+
 $pathEntries = (($env:PATH -split ';') | ForEach-Object { $_.Trim() }) | Where-Object { $_ }
 if (-not ($pathEntries -contains $installDir)) {
   Write-Warn "officecli is not on PATH. Add this location if you want to run it directly:"