oh-my-codex 0.18.5 → 0.18.6

package/dist/hud/render.js

@@ -3,8 +3,8 @@
  *
  * Renders HudRenderContext into formatted ANSI strings.
  */
-import { green, yellow, cyan, dim, bold, getRalphColor, isColorEnabled, RESET } from './colors.js';
-import { HUD_TMUX_MAX_HEIGHT_LINES } from './constants.js';
+import { green, yellow, cyan, dim, bold, magenta, getRalphColor, isColorEnabled, RESET } from './colors.js';
+import { HUD_TMUX_HEIGHT_LINES, HUD_TMUX_MAX_HEIGHT_LINES, HUD_TMUX_ULTRAGOAL_HEIGHT_LINES } from './constants.js';
 const SEP = dim(' | ');
 const CONTROL_CHARS_RE = /[\u0000-\u001f\u007f-\u009f]/g;
 const ANSI_SGR_RE = /\x1b\[[0-9;]*m/g;
@@ -127,6 +127,15 @@ function truncateDynamicText(value, maxLength) {
         return '…';
     return normalizeTrailingEllipsis(`${value.slice(0, maxLength - 1).trimEnd()}…`);
 }
+export function getHudRenderMaxLines(ctx) {
+    return ctx.ultragoal?.active ? HUD_TMUX_ULTRAGOAL_HEIGHT_LINES : HUD_TMUX_HEIGHT_LINES;
+}
+function clampHudMaxLines(ctx, maxLines) {
+    const adaptiveMaxLines = getHudRenderMaxLines(ctx);
+    if (!Number.isFinite(maxLines ?? Number.NaN) || (maxLines ?? 0) <= 0)
+        return adaptiveMaxLines;
+    return Math.min(Math.floor(maxLines ?? adaptiveMaxLines), adaptiveMaxLines);
+}
 function renderUltragoal(ctx) {
     if (!ctx.ultragoal?.active)
         return null;
@@ -135,26 +144,27 @@ function renderUltragoal(ctx) {
     if (!Number.isFinite(total) || total <= 0 || !Number.isFinite(complete))
         return null;
     const teamSummary = formatTeamSummary(ctx);
-    const progress = `ultragoal ${complete}/${total}${teamSummary ? ` + ${teamSummary}` : ''}`;
+    const progress = cyan(`ultragoal ${complete}/${total}${teamSummary ? ` + ${teamSummary}` : ''}`);
     const activeGoal = ctx.ultragoal.activeGoal ?? ctx.ultragoal.ongoingGoals?.[0];
-    const nextGoals = ctx.ultragoal.nextGoals ?? ctx.ultragoal.ongoingGoals?.filter((goal) => goal.id !== activeGoal?.id).slice(0, 3) ?? [];
-    const ongoingGoals = [
-        ...(activeGoal ? [activeGoal] : []),
-        ...nextGoals.slice(0, 3),
-    ]
-        .map((goal) => {
+    const formatGoal = (goal, titleLength) => {
+        if (!goal)
+            return '';
         const id = goal.id ? sanitizeDynamicText(goal.id) : '';
-        const title = goal.title ? truncateDynamicText(sanitizeDynamicText(goal.title), 36) : '';
+        const title = goal.title ? truncateDynamicText(sanitizeDynamicText(goal.title), titleLength) : '';
         const status = goal.status ? sanitizeDynamicText(goal.status) : '';
         const heading = [id, title].filter(Boolean).join(': ');
         return status && status !== 'in_progress' ? `${heading} (${status})` : heading;
-    })
-        .filter(Boolean);
+    };
+    const activeHeading = activeGoal ? formatGoal(activeGoal, 36) : '';
+    const activeSummary = activeHeading ? magenta(activeHeading) : '';
+    const ongoingGoals = [
+        activeSummary,
+    ].filter(Boolean);
     const rawObjective = activeGoal?.objective ? sanitizeDynamicText(activeGoal.objective) : '';
     const objective = ongoingGoals.length === 0 && rawObjective ? truncateDynamicText(rawObjective, 96) : '';
     const items = ongoingGoals.length > 0 ? ` ▶ ${ongoingGoals.join(' · ')}` : '';
     const summary = `${progress}${items}`;
-    return cyan(objective ? `${summary} ▶ objective: ${objective}` : summary);
+    return objective ? `${summary} ▶ ${dim(`objective: ${objective}`)}` : summary;
 }
 function renderExecutionSummary(ctx) {
     if (ctx.ultragoal?.active)
@@ -286,10 +296,48 @@ function ellipsizeSegment(segment, maxWidth) {
     if (maxWidth <= 1)
         return '…';
     if (maxWidth <= 4)
-        return `${plain.slice(0, Math.max(0, maxWidth - 1))}…`;
+        return `${sliceAnsiVisible(segment, 0, Math.max(0, maxWidth - 1))}…`;
     const head = Math.max(1, Math.ceil((maxWidth - 1) / 2));
     const tail = Math.max(1, Math.floor((maxWidth - 1) / 2));
-    return `${plain.slice(0, head)}…${plain.slice(-tail)}`;
+    return `${sliceAnsiVisible(segment, 0, head)}…${sliceAnsiVisible(segment, plain.length - tail, plain.length)}`;
+}
+function sliceAnsiVisible(value, start, end) {
+    if (end <= start)
+        return '';
+    let output = '';
+    let visibleIndex = 0;
+    let activeSgr = '';
+    let emittedActiveSgr = false;
+    for (let index = 0; index < value.length;) {
+        const sgrMatch = value.slice(index).match(/^\x1b\[[0-9;]*m/);
+        if (sgrMatch) {
+            const code = sgrMatch[0];
+            if (code === RESET || code === '\x1b[0m') {
+                activeSgr = '';
+            }
+            else {
+                activeSgr = code;
+            }
+            if (visibleIndex >= start && visibleIndex < end) {
+                output += code;
+            }
+            index += code.length;
+            continue;
+        }
+        const char = value[index] ?? '';
+        if (visibleIndex >= start && visibleIndex < end) {
+            if (!emittedActiveSgr && output.length === 0 && activeSgr) {
+                output += activeSgr;
+            }
+            output += char;
+            emittedActiveSgr = true;
+        }
+        visibleIndex += 1;
+        index += 1;
+        if (visibleIndex >= end)
+            break;
+    }
+    return output && activeSgr ? `${output}${RESET}` : output;
 }
 function wrapHudParts(label, parts, options) {
     const maxWidth = Number.isFinite(options.maxWidth) && (options.maxWidth ?? 0) > 0
@@ -349,10 +397,14 @@ export function renderHud(ctx, preset, options = {}) {
         .filter((s) => s !== null);
     const ver = ctx.version ? `#${ctx.version.replace(/^v/, '')}` : '';
     const label = bold(`[OMX${ver}]`);
+    const renderOptions = {
+        ...options,
+        maxLines: clampHudMaxLines(ctx, options.maxLines),
+    };
     if (parts.length === 0) {
-        return wrapHudParts(label, [dim('No active modes.')], options);
+        return wrapHudParts(label, [dim('No active modes.')], renderOptions);
     }
-    return wrapHudParts(label, parts, options);
+    return wrapHudParts(label, parts, renderOptions);
 }
 export function countRenderedHudLines(text) {
     return text.replace(/\r/g, '').split('\n').length;

package/dist/hud/render.js.map

@@ -1 +1 @@
-{"version":3,"file":"render.js","sourceRoot":"","sources":["../../src/hud/render.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"render.js","sourceRoot":"","sources":["../../src/hud/render.ts"],"names":[],"mappings":"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"}

package/dist/scripts/check-version-sync.js

@@ -8,8 +8,9 @@ const workspace = TOML.parse(readFileSync(join(root, 'Cargo.toml'), 'utf-8'));
 const explore = TOML.parse(readFileSync(join(root, 'crates', 'omx-explore', 'Cargo.toml'), 'utf-8'));
 const runtimeCore = TOML.parse(readFileSync(join(root, 'crates', 'omx-runtime-core', 'Cargo.toml'), 'utf-8'));
 const mux = TOML.parse(readFileSync(join(root, 'crates', 'omx-mux', 'Cargo.toml'), 'utf-8'));
-const runtime = TOML.parse(readFileSync(join(root, 'native', 'omx-runtime', 'Cargo.toml'), 'utf-8'));
-const sparkshell = TOML.parse(readFileSync(join(root, 'native', 'omx-sparkshell', 'Cargo.toml'), 'utf-8'));
+const api = TOML.parse(readFileSync(join(root, 'crates', 'omx-api', 'Cargo.toml'), 'utf-8'));
+const runtime = TOML.parse(readFileSync(join(root, 'crates', 'omx-runtime', 'Cargo.toml'), 'utf-8'));
+const sparkshell = TOML.parse(readFileSync(join(root, 'crates', 'omx-sparkshell', 'Cargo.toml'), 'utf-8'));
 const tagArgIndex = process.argv.indexOf('--tag');
 const tag = tagArgIndex >= 0 ? process.argv[tagArgIndex + 1] : undefined;
 const pkgVersion = String(pkg.version || '').trim();
@@ -22,6 +23,9 @@ if (!workspaceVersion)
 if (pkgVersion && workspaceVersion && pkgVersion !== workspaceVersion) {
     problems.push(`package.json version (${pkgVersion}) does not match workspace version (${workspaceVersion})`);
 }
+if (api.package?.version !== undefined && api.package.version?.workspace !== true) {
+    problems.push('crates/omx-api/Cargo.toml must use version.workspace = true');
+}
 if (explore.package?.version !== undefined && explore.package.version?.workspace !== true) {
     problems.push('crates/omx-explore/Cargo.toml must use version.workspace = true');
 }
@@ -32,10 +36,10 @@ if (mux.package?.version !== undefined && mux.package.version?.workspace !== tru
     problems.push('crates/omx-mux/Cargo.toml must use version.workspace = true');
 }
 if (runtime.package?.version !== undefined && runtime.package.version?.workspace !== true) {
-    problems.push('native/omx-runtime/Cargo.toml must use version.workspace = true');
+    problems.push('crates/omx-runtime/Cargo.toml must use version.workspace = true');
 }
 if (sparkshell.package?.version !== undefined && sparkshell.package.version?.workspace !== true) {
-    problems.push('native/omx-sparkshell/Cargo.toml must use version.workspace = true');
+    problems.push('crates/omx-sparkshell/Cargo.toml must use version.workspace = true');
 }
 if (tag && tag !== `v${pkgVersion}`) {
     problems.push(`release tag (${tag}) does not match package.json version (v${pkgVersion})`);

package/dist/scripts/check-version-sync.js.map

@@ -1 +1 @@
-{"version":3,"file":"check-version-sync.js","sourceRoot":"","sources":["../../src/scripts/check-version-sync.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"check-version-sync.js","sourceRoot":"","sources":["../../src/scripts/check-version-sync.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-codex",
-  "version": "0.18.5",
+  "version": "0.18.6",
   "description": "Multi-agent orchestration layer for OpenAI Codex CLI",
   "type": "module",
   "main": "dist/index.js",

package/plugins/oh-my-codex/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-codex",
-  "version": "0.18.5",
+  "version": "0.18.6",
   "description": "Multi-agent orchestration layer for OpenAI Codex CLI",
   "author": {
     "name": "Yeachan Heo",

package/src/scripts/check-version-sync.ts

@@ -9,8 +9,9 @@ const workspace = TOML.parse(readFileSync(join(root, 'Cargo.toml'), 'utf-8')) as
 const explore = TOML.parse(readFileSync(join(root, 'crates', 'omx-explore', 'Cargo.toml'), 'utf-8')) as Record<string, unknown>;
 const runtimeCore = TOML.parse(readFileSync(join(root, 'crates', 'omx-runtime-core', 'Cargo.toml'), 'utf-8')) as Record<string, unknown>;
 const mux = TOML.parse(readFileSync(join(root, 'crates', 'omx-mux', 'Cargo.toml'), 'utf-8')) as Record<string, unknown>;
-const runtime = TOML.parse(readFileSync(join(root, 'native', 'omx-runtime', 'Cargo.toml'), 'utf-8')) as Record<string, unknown>;
-const sparkshell = TOML.parse(readFileSync(join(root, 'native', 'omx-sparkshell', 'Cargo.toml'), 'utf-8')) as Record<string, unknown>;
+const api = TOML.parse(readFileSync(join(root, 'crates', 'omx-api', 'Cargo.toml'), 'utf-8')) as Record<string, unknown>;
+const runtime = TOML.parse(readFileSync(join(root, 'crates', 'omx-runtime', 'Cargo.toml'), 'utf-8')) as Record<string, unknown>;
+const sparkshell = TOML.parse(readFileSync(join(root, 'crates', 'omx-sparkshell', 'Cargo.toml'), 'utf-8')) as Record<string, unknown>;
 const tagArgIndex = process.argv.indexOf('--tag');
 const tag = tagArgIndex >= 0 ? process.argv[tagArgIndex + 1] : undefined;
 
@@ -23,6 +24,9 @@ if (!workspaceVersion) problems.push('Cargo.toml [workspace.package].version is
 if (pkgVersion && workspaceVersion && pkgVersion !== workspaceVersion) {
   problems.push(`package.json version (${pkgVersion}) does not match workspace version (${workspaceVersion})`);
 }
+if ((api.package as Record<string, unknown>)?.version !== undefined && ((api.package as Record<string, unknown>).version as Record<string, unknown>)?.workspace !== true) {
+  problems.push('crates/omx-api/Cargo.toml must use version.workspace = true');
+}
 if ((explore.package as Record<string, unknown>)?.version !== undefined && ((explore.package as Record<string, unknown>).version as Record<string, unknown>)?.workspace !== true) {
   problems.push('crates/omx-explore/Cargo.toml must use version.workspace = true');
 }
@@ -33,10 +37,10 @@ if ((mux.package as Record<string, unknown>)?.version !== undefined && ((mux.pac
   problems.push('crates/omx-mux/Cargo.toml must use version.workspace = true');
 }
 if ((runtime.package as Record<string, unknown>)?.version !== undefined && ((runtime.package as Record<string, unknown>).version as Record<string, unknown>)?.workspace !== true) {
-  problems.push('native/omx-runtime/Cargo.toml must use version.workspace = true');
+  problems.push('crates/omx-runtime/Cargo.toml must use version.workspace = true');
 }
 if ((sparkshell.package as Record<string, unknown>)?.version !== undefined && ((sparkshell.package as Record<string, unknown>).version as Record<string, unknown>)?.workspace !== true) {
-  problems.push('native/omx-sparkshell/Cargo.toml must use version.workspace = true');
+  problems.push('crates/omx-sparkshell/Cargo.toml must use version.workspace = true');
 }
 if (tag && tag !== `v${pkgVersion}`) {
   problems.push(`release tag (${tag}) does not match package.json version (v${pkgVersion})`);