mirror of
https://github.com/getcompanion-ai/co-mono.git
synced 2026-04-20 06:04:15 +00:00
Add the codex bridge prompt in the html export
This commit is contained in:
parent
a236e62025
commit
6a5f04ce1f
8 changed files with 103 additions and 10 deletions
|
|
@ -3,6 +3,7 @@ export * from "./providers/anthropic.js";
|
||||||
export * from "./providers/google.js";
|
export * from "./providers/google.js";
|
||||||
export * from "./providers/google-gemini-cli.js";
|
export * from "./providers/google-gemini-cli.js";
|
||||||
export * from "./providers/google-vertex.js";
|
export * from "./providers/google-vertex.js";
|
||||||
|
export * from "./providers/openai-codex/index.js";
|
||||||
export * from "./providers/openai-completions.js";
|
export * from "./providers/openai-completions.js";
|
||||||
export * from "./providers/openai-responses.js";
|
export * from "./providers/openai-responses.js";
|
||||||
export * from "./stream.js";
|
export * from "./stream.js";
|
||||||
|
|
|
||||||
7
packages/ai/src/providers/openai-codex/index.ts
Normal file
7
packages/ai/src/providers/openai-codex/index.ts
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
/**
|
||||||
|
* OpenAI Codex utilities - exported for use by coding-agent export
|
||||||
|
*/
|
||||||
|
|
||||||
|
export { type CacheMetadata, getCodexInstructions, getModelFamily, type ModelFamily } from "./prompts/codex.js";
|
||||||
|
export { buildCodexPiBridge } from "./prompts/pi-codex-bridge.js";
|
||||||
|
export { buildCodexSystemPrompt, type CodexSystemPrompt } from "./prompts/system-prompt.js";
|
||||||
|
|
@ -2057,9 +2057,9 @@ export class AgentSession {
|
||||||
* @param outputPath Optional output path (defaults to session directory)
|
* @param outputPath Optional output path (defaults to session directory)
|
||||||
* @returns Path to exported file
|
* @returns Path to exported file
|
||||||
*/
|
*/
|
||||||
exportToHtml(outputPath?: string): string {
|
async exportToHtml(outputPath?: string): Promise<string> {
|
||||||
const themeName = this.settingsManager.getTheme();
|
const themeName = this.settingsManager.getTheme();
|
||||||
return exportSessionToHtml(this.sessionManager, this.state, { outputPath, themeName });
|
return await exportSessionToHtml(this.sessionManager, this.state, { outputPath, themeName });
|
||||||
}
|
}
|
||||||
|
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
import type { AgentState } from "@mariozechner/pi-agent-core";
|
import type { AgentState } from "@mariozechner/pi-agent-core";
|
||||||
|
import { buildCodexPiBridge, getCodexInstructions, getModelFamily } from "@mariozechner/pi-ai";
|
||||||
import { existsSync, readFileSync, writeFileSync } from "fs";
|
import { existsSync, readFileSync, writeFileSync } from "fs";
|
||||||
import { basename, join } from "path";
|
import { basename, join } from "path";
|
||||||
import { APP_NAME, getExportTemplateDir } from "../../config.js";
|
import { APP_NAME, getExportTemplateDir } from "../../config.js";
|
||||||
|
|
@ -10,6 +11,47 @@ export interface ExportOptions {
|
||||||
themeName?: string;
|
themeName?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface ProviderSystemPrompt {
|
||||||
|
title: string;
|
||||||
|
content: string;
|
||||||
|
note?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Build the provider-specific system prompt for display in exports.
|
||||||
|
* Currently only supports OpenAI Codex provider.
|
||||||
|
*/
|
||||||
|
async function buildProviderSystemPrompt(state?: AgentState): Promise<ProviderSystemPrompt | undefined> {
|
||||||
|
if (!state?.model || state.model.provider !== "openai-codex") {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
let instructions: string | null = null;
|
||||||
|
try {
|
||||||
|
instructions = await getCodexInstructions(state.model.id);
|
||||||
|
} catch {
|
||||||
|
// Cache miss or fetch failed - that's fine
|
||||||
|
}
|
||||||
|
|
||||||
|
const bridgeText = buildCodexPiBridge(state.tools);
|
||||||
|
const userPrompt = state.systemPrompt || "";
|
||||||
|
const modelFamily = getModelFamily(state.model.id);
|
||||||
|
|
||||||
|
const instructionsText =
|
||||||
|
instructions || "(Codex instructions not cached. Run a Codex request to populate the local cache.)";
|
||||||
|
const note = instructions
|
||||||
|
? `Injected by the OpenAI Codex provider for model family "${modelFamily}" (instructions + bridge + user system prompt).`
|
||||||
|
: "Codex instructions unavailable; showing bridge and user system prompt only.";
|
||||||
|
|
||||||
|
const content = `# Codex Instructions\n${instructionsText}\n\n# Codex-Pi Bridge\n${bridgeText}\n\n# User System Prompt\n${userPrompt || "(empty)"}`;
|
||||||
|
|
||||||
|
return {
|
||||||
|
title: "Injected Prompt (OpenAI Codex)",
|
||||||
|
content,
|
||||||
|
note,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
/** Parse a color string to RGB values. Supports hex (#RRGGBB) and rgb(r,g,b) formats. */
|
/** Parse a color string to RGB values. Supports hex (#RRGGBB) and rgb(r,g,b) formats. */
|
||||||
function parseColor(color: string): { r: number; g: number; b: number } | undefined {
|
function parseColor(color: string): { r: number; g: number; b: number } | undefined {
|
||||||
const hexMatch = color.match(/^#([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/);
|
const hexMatch = color.match(/^#([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/);
|
||||||
|
|
@ -103,6 +145,7 @@ interface SessionData {
|
||||||
entries: ReturnType<SessionManager["getEntries"]>;
|
entries: ReturnType<SessionManager["getEntries"]>;
|
||||||
leafId: string | null;
|
leafId: string | null;
|
||||||
systemPrompt?: string;
|
systemPrompt?: string;
|
||||||
|
providerSystemPrompt?: ProviderSystemPrompt;
|
||||||
tools?: { name: string; description: string }[];
|
tools?: { name: string; description: string }[];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -146,7 +189,11 @@ function generateHtml(sessionData: SessionData, themeName?: string): string {
|
||||||
* Export session to HTML using SessionManager and AgentState.
|
* Export session to HTML using SessionManager and AgentState.
|
||||||
* Used by TUI's /export command.
|
* Used by TUI's /export command.
|
||||||
*/
|
*/
|
||||||
export function exportSessionToHtml(sm: SessionManager, state?: AgentState, options?: ExportOptions | string): string {
|
export async function exportSessionToHtml(
|
||||||
|
sm: SessionManager,
|
||||||
|
state?: AgentState,
|
||||||
|
options?: ExportOptions | string,
|
||||||
|
): Promise<string> {
|
||||||
const opts: ExportOptions = typeof options === "string" ? { outputPath: options } : options || {};
|
const opts: ExportOptions = typeof options === "string" ? { outputPath: options } : options || {};
|
||||||
|
|
||||||
const sessionFile = sm.getSessionFile();
|
const sessionFile = sm.getSessionFile();
|
||||||
|
|
@ -162,6 +209,7 @@ export function exportSessionToHtml(sm: SessionManager, state?: AgentState, opti
|
||||||
entries: sm.getEntries(),
|
entries: sm.getEntries(),
|
||||||
leafId: sm.getLeafId(),
|
leafId: sm.getLeafId(),
|
||||||
systemPrompt: state?.systemPrompt,
|
systemPrompt: state?.systemPrompt,
|
||||||
|
providerSystemPrompt: await buildProviderSystemPrompt(state),
|
||||||
tools: state?.tools?.map((t) => ({ name: t.name, description: t.description })),
|
tools: state?.tools?.map((t) => ({ name: t.name, description: t.description })),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -195,6 +243,7 @@ export function exportFromFile(inputPath: string, options?: ExportOptions | stri
|
||||||
entries: sm.getEntries(),
|
entries: sm.getEntries(),
|
||||||
leafId: sm.getLeafId(),
|
leafId: sm.getLeafId(),
|
||||||
systemPrompt: undefined,
|
systemPrompt: undefined,
|
||||||
|
providerSystemPrompt: undefined,
|
||||||
tools: undefined,
|
tools: undefined,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -593,6 +593,17 @@
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.system-prompt.provider-prompt {
|
||||||
|
border-left: 3px solid var(--warning);
|
||||||
|
}
|
||||||
|
|
||||||
|
.system-prompt-note {
|
||||||
|
font-size: 10px;
|
||||||
|
font-style: italic;
|
||||||
|
color: var(--muted);
|
||||||
|
margin-top: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
/* Tools list */
|
/* Tools list */
|
||||||
.tools-list {
|
.tools-list {
|
||||||
background: var(--customMessageBg);
|
background: var(--customMessageBg);
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
bytes[i] = binary.charCodeAt(i);
|
bytes[i] = binary.charCodeAt(i);
|
||||||
}
|
}
|
||||||
const data = JSON.parse(new TextDecoder('utf-8').decode(bytes));
|
const data = JSON.parse(new TextDecoder('utf-8').decode(bytes));
|
||||||
const { header, entries, leafId: defaultLeafId, systemPrompt, tools } = data;
|
const { header, entries, leafId: defaultLeafId, systemPrompt, providerSystemPrompt, tools } = data;
|
||||||
|
|
||||||
// ============================================================
|
// ============================================================
|
||||||
// URL PARAMETER HANDLING
|
// URL PARAMETER HANDLING
|
||||||
|
|
@ -1060,7 +1060,32 @@
|
||||||
</div>
|
</div>
|
||||||
</div>`;
|
</div>`;
|
||||||
|
|
||||||
if (systemPrompt) {
|
// Render provider-injected system prompt (e.g., Codex) if present
|
||||||
|
if (providerSystemPrompt) {
|
||||||
|
const lines = providerSystemPrompt.content.split('\n');
|
||||||
|
const previewLines = 10;
|
||||||
|
const noteHtml = providerSystemPrompt.note
|
||||||
|
? `<div class="system-prompt-note">${escapeHtml(providerSystemPrompt.note)}</div>`
|
||||||
|
: '';
|
||||||
|
if (lines.length > previewLines) {
|
||||||
|
const preview = lines.slice(0, previewLines).join('\n');
|
||||||
|
const remaining = lines.length - previewLines;
|
||||||
|
html += `<div class="system-prompt provider-prompt expandable" onclick="this.classList.toggle('expanded')">
|
||||||
|
<div class="system-prompt-header">${escapeHtml(providerSystemPrompt.title)}</div>
|
||||||
|
${noteHtml}
|
||||||
|
<div class="system-prompt-preview">${escapeHtml(preview)}</div>
|
||||||
|
<div class="system-prompt-expand-hint">... (${remaining} more lines, click to expand)</div>
|
||||||
|
<div class="system-prompt-full">${escapeHtml(providerSystemPrompt.content)}</div>
|
||||||
|
</div>`;
|
||||||
|
} else {
|
||||||
|
html += `<div class="system-prompt provider-prompt">
|
||||||
|
<div class="system-prompt-header">${escapeHtml(providerSystemPrompt.title)}</div>
|
||||||
|
${noteHtml}
|
||||||
|
<div class="system-prompt-full" style="display: block">${escapeHtml(providerSystemPrompt.content)}</div>
|
||||||
|
</div>`;
|
||||||
|
}
|
||||||
|
} else if (systemPrompt) {
|
||||||
|
// Standard system prompt (non-Codex providers)
|
||||||
const lines = systemPrompt.split('\n');
|
const lines = systemPrompt.split('\n');
|
||||||
const previewLines = 10;
|
const previewLines = 10;
|
||||||
if (lines.length > previewLines) {
|
if (lines.length > previewLines) {
|
||||||
|
|
|
||||||
|
|
@ -999,7 +999,7 @@ export class InteractiveMode {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (text.startsWith("/export")) {
|
if (text.startsWith("/export")) {
|
||||||
this.handleExportCommand(text);
|
await this.handleExportCommand(text);
|
||||||
this.editor.setText("");
|
this.editor.setText("");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -2402,12 +2402,12 @@ export class InteractiveMode {
|
||||||
// Command handlers
|
// Command handlers
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
|
|
||||||
private handleExportCommand(text: string): void {
|
private async handleExportCommand(text: string): Promise<void> {
|
||||||
const parts = text.split(/\s+/);
|
const parts = text.split(/\s+/);
|
||||||
const outputPath = parts.length > 1 ? parts[1] : undefined;
|
const outputPath = parts.length > 1 ? parts[1] : undefined;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const filePath = this.session.exportToHtml(outputPath);
|
const filePath = await this.session.exportToHtml(outputPath);
|
||||||
this.showStatus(`Session exported to: ${filePath}`);
|
this.showStatus(`Session exported to: ${filePath}`);
|
||||||
} catch (error: unknown) {
|
} catch (error: unknown) {
|
||||||
this.showError(`Failed to export session: ${error instanceof Error ? error.message : "Unknown error"}`);
|
this.showError(`Failed to export session: ${error instanceof Error ? error.message : "Unknown error"}`);
|
||||||
|
|
@ -2430,7 +2430,7 @@ export class InteractiveMode {
|
||||||
// Export to a temp file
|
// Export to a temp file
|
||||||
const tmpFile = path.join(os.tmpdir(), "session.html");
|
const tmpFile = path.join(os.tmpdir(), "session.html");
|
||||||
try {
|
try {
|
||||||
this.session.exportToHtml(tmpFile);
|
await this.session.exportToHtml(tmpFile);
|
||||||
} catch (error: unknown) {
|
} catch (error: unknown) {
|
||||||
this.showError(`Failed to export session: ${error instanceof Error ? error.message : "Unknown error"}`);
|
this.showError(`Failed to export session: ${error instanceof Error ? error.message : "Unknown error"}`);
|
||||||
return;
|
return;
|
||||||
|
|
|
||||||
|
|
@ -431,7 +431,7 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
|
||||||
}
|
}
|
||||||
|
|
||||||
case "export_html": {
|
case "export_html": {
|
||||||
const path = session.exportToHtml(command.outputPath);
|
const path = await session.exportToHtml(command.outputPath);
|
||||||
return success(id, "export_html", { path });
|
return success(id, "export_html", { path });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue