addInstructions

This commit is contained in:
David Blass
2025-11-12 20:07:57 -05:00
parent 0a01a25382
commit b65a6df9f7
4 changed files with 14 additions and 18 deletions
+2 -3
View File
@@ -3,12 +3,11 @@ import { createWriteStream, existsSync, rmSync } from "node:fs";
import { mkdtemp } from "node:fs/promises"; import { mkdtemp } from "node:fs/promises";
import { tmpdir } from "node:os"; import { tmpdir } from "node:os";
import { join } from "node:path"; import { join } from "node:path";
import { pipeline } from "node:stream/promises"; import { pipeline } from "node:stream/promises";
import { query, type SDKMessage } from "@anthropic-ai/claude-agent-sdk"; import { query, type SDKMessage } from "@anthropic-ai/claude-agent-sdk";
import packageJson from "../package.json" with { type: "json" }; import packageJson from "../package.json" with { type: "json" };
import { log } from "../utils/cli.ts"; import { log } from "../utils/cli.ts";
import { agent, instructions } from "./shared.ts"; import { addInstructions, agent } from "./shared.ts";
export const claude = agent({ export const claude = agent({
name: "claude", name: "claude",
@@ -94,7 +93,7 @@ export const claude = agent({
process.env.ANTHROPIC_API_KEY = apiKey; process.env.ANTHROPIC_API_KEY = apiKey;
const queryInstance = query({ const queryInstance = query({
prompt: `${instructions}\n\n****** USER PROMPT ******\n${prompt}`, prompt: addInstructions(prompt),
options: { options: {
permissionMode: "bypassPermissions", permissionMode: "bypassPermissions",
mcpServers, mcpServers,
+2 -6
View File
@@ -1,7 +1,7 @@
import { spawnSync } from "node:child_process"; import { spawnSync } from "node:child_process";
import { findCliPath, log } from "../utils/cli.ts"; import { findCliPath, log } from "../utils/cli.ts";
import { agent, instructions } from "./shared.ts"; import { addInstructions, agent } from "./shared.ts";
export const codex = agent({ export const codex = agent({
name: "codex", name: "codex",
@@ -92,14 +92,10 @@ export const codex = agent({
} }
} }
// Use codex exec command via CLI
const fullPrompt = `${instructions}\n\n****** USER PROMPT ******\n${prompt}`;
log.info("Running Codex via CLI..."); log.info("Running Codex via CLI...");
try { try {
// Execute codex via CLI using child_process const result = spawnSync(cliPath, ["exec", addInstructions(prompt)], {
const result = spawnSync("codex", ["exec", fullPrompt], {
encoding: "utf-8", encoding: "utf-8",
env: { env: {
...process.env, ...process.env,
+3
View File
@@ -75,3 +75,6 @@ ${workflows.map((w) => ` - "${w.name}": ${w.description}`).join("\n")}
${workflows.map((w) => `### ${w.name}\n\n${w.prompt}`).join("\n\n")} ${workflows.map((w) => `### ${w.name}\n\n${w.prompt}`).join("\n\n")}
`; `;
export const addInstructions = (prompt: string) =>
`****** GENERAL INSTRUCTIONS ******\n${instructions}\n\n****** USER PROMPT ******\n${prompt}`;
+7 -9
View File
@@ -41218,6 +41218,11 @@ ${workflows.map((w) => `### ${w.name}
${w.prompt}`).join("\n\n")} ${w.prompt}`).join("\n\n")}
`; `;
var addInstructions = (prompt) => `****** GENERAL INSTRUCTIONS ******
${instructions}
****** USER PROMPT ******
${prompt}`;
// agents/claude.ts // agents/claude.ts
var claude = agent({ var claude = agent({
@@ -41281,10 +41286,7 @@ var claude = agent({
run: async ({ prompt, mcpServers, apiKey, cliPath }) => { run: async ({ prompt, mcpServers, apiKey, cliPath }) => {
process.env.ANTHROPIC_API_KEY = apiKey; process.env.ANTHROPIC_API_KEY = apiKey;
const queryInstance = query({ const queryInstance = query({
prompt: `${instructions} prompt: addInstructions(prompt),
****** USER PROMPT ******
${prompt}`,
options: { options: {
permissionMode: "bypassPermissions", permissionMode: "bypassPermissions",
mcpServers, mcpServers,
@@ -41465,13 +41467,9 @@ var codex = agent({
} }
} }
} }
const fullPrompt = `${instructions}
****** USER PROMPT ******
${prompt}`;
log.info("Running Codex via CLI..."); log.info("Running Codex via CLI...");
try { try {
const result = spawnSync2("codex", ["exec", fullPrompt], { const result = spawnSync2(cliPath, ["exec", addInstructions(prompt)], {
encoding: "utf-8", encoding: "utf-8",
env: { env: {
...process.env, ...process.env,