update

packages/adapter-gemini-local/src/server/execute.ts

@@ -1,8 +1,6 @@
 import fs from "node:fs/promises";
-import type { Dirent } from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import { fileURLToPath } from "node:url";
 import type { AdapterExecutionContext, AdapterExecutionResult, ManagedSkillRef } from "@agentcompany/adapter-utils";
 import {
   asBoolean,
@@ -18,7 +16,6 @@ import {
   redactEnvForLogs,
   renderTemplate,
   runChildProcess,
-  createManagedSkillSymlinks,
 } from "@agentcompany/adapter-utils/server-utils";
 import { DEFAULT_GEMINI_LOCAL_MODEL } from "../index.js";
 import {
@@ -29,122 +26,12 @@ import {
   parseGeminiJsonl,
 } from "./parse.js";
 import { firstNonEmptyLine } from "@agentcompany/adapter-utils/test-utils";
-
-const __moduleDir = path.dirname(fileURLToPath(import.meta.url));
-const SKILLS_CANDIDATES = [
-  path.resolve(__moduleDir, "../../skills"),
-  path.resolve(__moduleDir, "../../../../../skills"),
-];
-
-function hasNonEmptyEnvValue(env: Record<string, string>, key: string): boolean {
-  const raw = env[key];
-  return typeof raw === "string" && raw.trim().length > 0;
-}
-
-function resolveGeminiBillingType(env: Record<string, string>): "api" | "subscription" {
-  return hasNonEmptyEnvValue(env, "GEMINI_API_KEY") || hasNonEmptyEnvValue(env, "GOOGLE_API_KEY")
-    ? "api"
-    : "subscription";
-}
-
-function renderEnvNote(env: Record<string, string>): string {
-  const agentCompanyKeys = Object.keys(env)
-    .filter((key) => key.startsWith("AGENT_COMPANY_"))
-    .sort();
-  if (agentCompanyKeys.length === 0) return "";
-  return [
-    "Runtime note:",
-    `The following AGENT_COMPANY_* environment variables are available in this run: ${agentCompanyKeys.join(", ")}`,
-    "Do not assume these variables are missing without checking your shell environment.",
-    "",
-    "",
-  ].join("\n");
-}
-
-function renderApiAccessNote(env: Record<string, string>): string {
-  if (!hasNonEmptyEnvValue(env, "AGENT_COMPANY_API_URL") || !hasNonEmptyEnvValue(env, "AGENT_COMPANY_API_KEY")) return "";
-  return [
-    "API access note:",
-    "Use run_shell_command with curl to make API requests.",
-    "GET example:",
-    `  run_shell_command({ command: "curl -s -H \\"Authorization: Bearer $AGENT_COMPANY_API_KEY\\" \\"$AGENT_COMPANY_API_URL/api/agents/me\\"" })`,
-    "POST/PATCH example:",
-    `  run_shell_command({ command: "curl -s -X POST -H \\"Authorization: Bearer $AGENT_COMPANY_API_KEY\\" -H 'Content-Type: application/json' -H \\"X-Agent-Company-Run-Id: $AGENT_COMPANY_RUN_ID\\" -d '{...}' \\"$AGENT_COMPANY_API_URL/api/issues/{id}/checkout\\"" })`,
-    "",
-    "",
-  ].join("\n");
-}
-
-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;
-}
-
-function geminiSkillsHome(): string {
-  return path.join(os.homedir(), ".gemini", "skills");
-}
-
-/**
- * Inject AgentCompany skills directly into `~/.gemini/skills/` via symlinks.
- * Uses managed skills when available; falls back to static repo scan.
- */
-async function ensureGeminiSkillsInjected(
-  managedSkills: ManagedSkillRef[],
-  onLog: AdapterExecutionContext["onLog"],
-): Promise<void> {
-  const skillsHome = geminiSkillsHome();
-
-  // 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();
-  if (!skillsDir) return;
-
-  try {
-    await fs.mkdir(skillsHome, { recursive: true });
-  } catch (err) {
-    await onLog(
-      "stderr",
-      `[agent-company] Failed to prepare Gemini skills directory ${skillsHome}: ${err instanceof Error ? err.message : String(err)}\n`,
-    );
-    return;
-  }
-
-  let entries: Dirent[];
-  try {
-    entries = await fs.readdir(skillsDir, { withFileTypes: true });
-  } catch (err) {
-    await onLog(
-      "stderr",
-      `[agent-company] Failed to read AgentCompany skills from ${skillsDir}: ${err instanceof Error ? err.message : String(err)}\n`,
-    );
-    return;
-  }
-
-  for (const entry of entries) {
-    if (!entry.isDirectory()) continue;
-    const source = path.join(skillsDir, entry.name);
-    const target = path.join(skillsHome, entry.name);
-    const existing = await fs.lstat(target).catch(() => null);
-    if (existing) continue;
-
-    try {
-      await fs.symlink(source, target);
-      await onLog("stderr", `[agent-company] Linked Gemini skill: ${entry.name}\n`);
-    } catch (err) {
-      await onLog(
-        "stderr",
-        `[agent-company] Failed to link Gemini skill "${entry.name}": ${err instanceof Error ? err.message : String(err)}\n`,
-      );
-    }
-  }
-}
+import {
+  resolveGeminiBillingType,
+  renderEnvNote,
+  renderApiAccessNote,
+  ensureGeminiSkillsInjected,
+} from "./execute-helpers.js";
 
 export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExecutionResult> {
   const { runId, agent, runtime, config, context, onLog, onMeta, authToken } = ctx;
@@ -275,25 +162,6 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExec
       );
     }
   }
-  const commandNotes = (() => {
-    const notes: string[] = [useStdin
-      ? "Prompt passed via stdin (exceeds command-line length limit)."
-      : "Prompt is passed to Gemini as the final positional argument."];
-    notes.push("Added --approval-mode yolo for unattended execution.");
-    if (!instructionsFilePath) return notes;
-    if (instructionsPrefix.length > 0) {
-      notes.push(
-        `Loaded agent instructions from ${instructionsFilePath}`,
-        `Prepended instructions + path directive to prompt (relative references from ${instructionsDir}).`,
-      );
-      return notes;
-    }
-    notes.push(
-      `Configured instructionsFilePath ${instructionsFilePath}, but file could not be read; continuing without injected instructions.`,
-    );
-    return notes;
-  })();
-
   const renderedPrompt = renderTemplate(promptTemplate, {
     agentId: agent.id,
     companyId: agent.companyId,
@@ -313,6 +181,24 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExec
   // and pass the content via stdin to avoid ENAMETOOLONG.
   const SAFE_ARG_LIMIT = 30_000;
   const useStdin = prompt.length > SAFE_ARG_LIMIT;
+  const commandNotes = (() => {
+    const notes: string[] = [useStdin
+      ? "Prompt passed via stdin (exceeds command-line length limit)."
+      : "Prompt is passed to Gemini as the final positional argument."];
+    notes.push("Added --approval-mode yolo for unattended execution.");
+    if (!instructionsFilePath) return notes;
+    if (instructionsPrefix.length > 0) {
+      notes.push(
+        `Loaded agent instructions from ${instructionsFilePath}`,
+        `Prepended instructions + path directive to prompt (relative references from ${instructionsDir}).`,
+      );
+      return notes;
+    }
+    notes.push(
+      `Configured instructionsFilePath ${instructionsFilePath}, but file could not be read; continuing without injected instructions.`,
+    );
+    return notes;
+  })();
   let promptFilePath: string | null = null;
   if (useStdin) {
     promptFilePath = path.join(os.tmpdir(), `agentcompany-gemini-prompt-${runId}.txt`);