update

packages/adapter-codex-local/src/server/execute-helpers.ts

@@ -1,17 +1,29 @@
-import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
-import { fileURLToPath } from "node:url";
 import type { AdapterExecutionContext, ManagedSkillRef } from "@agentcompany/adapter-utils";
+import {
+  hasNonEmptyEnvValue,
+  buildSkillsCandidates,
+  resolveSkillsDir,
+  parseManagedSkills,
+  parseExtraArgs,
+  buildCommonAgentCompanyEnv,
+  resolveSessionResumeState,
+} from "@agentcompany/adapter-utils";
 import {
   createManagedSkillSymlinks,
 } from "@agentcompany/adapter-utils/server-utils";
+import fs from "node:fs/promises";
 
-const __moduleDir = path.dirname(fileURLToPath(import.meta.url));
-export const SKILLS_CANDIDATES = [
-  path.resolve(__moduleDir, "../../skills"),         // published: <pkg>/dist/server/ -> <pkg>/skills/
-  path.resolve(__moduleDir, "../../../../../skills"), // dev: src/server/ -> repo root/skills/
-];
+export {
+  hasNonEmptyEnvValue,
+  parseManagedSkills,
+  parseExtraArgs,
+  buildCommonAgentCompanyEnv,
+  resolveSessionResumeState,
+};
+
+export const SKILLS_CANDIDATES = buildSkillsCandidates(import.meta.url);
 
 export const CODEX_ROLLOUT_NOISE_RE =
   /^\d{4}-\d{2}-\d{2}T[^\s]+\s+ERROR\s+codex_core::rollout::list:\s+state db missing rollout path for thread\s+[a-z0-9-]+$/i;
@@ -31,13 +43,7 @@ export function stripCodexRolloutNoise(text: string): string {
   return kept.join("\n");
 }
 
-export function hasNonEmptyEnvValue(env: Record<string, string>, key: string): boolean {
-  const raw = env[key];
-  return typeof raw === "string" && raw.trim().length > 0;
-}
-
 export function resolveCodexBillingType(env: Record<string, string>): "api" | "subscription" {
-  // Codex uses API-key auth when OPENAI_API_KEY is present; otherwise rely on local login/session auth.
   return hasNonEmptyEnvValue(env, "OPENAI_API_KEY") ? "api" : "subscription";
 }
 
@@ -48,11 +54,7 @@ export function codexHomeDir(): string {
 }
 
 export async function resolveAgentCompanySkillsDir(): Promise<string | null> {
-  for (const candidate of SKILLS_CANDIDATES) {
-    const isDir = await fs.stat(candidate).then((s) => s.isDirectory()).catch(() => false);
-    if (isDir) return candidate;
-  }
-  return null;
+  return resolveSkillsDir(SKILLS_CANDIDATES);
 }
 
 export async function ensureCodexSkillsInjected(
@@ -61,13 +63,12 @@ export async function ensureCodexSkillsInjected(
 ) {
   const skillsHome = path.join(codexHomeDir(), "skills");
 
-  // Use managed skills when available; fall back to static repo scan
   if (managedSkills.length > 0) {
     await createManagedSkillSymlinks(managedSkills, skillsHome, onLog);
     return;
   }
 
-  const skillsDir = await resolveAgentCompanySkillsDir();
+  const skillsDir = await resolveSkillsDir(SKILLS_CANDIDATES);
   if (!skillsDir) return;
 
   await fs.mkdir(skillsHome, { recursive: true });