Merge remote-tracking branch 'origin/main' into fix/pr-7-review

# Conflicts: # index.ts # package.json # tests/test-pi-local.mjs
2026-05-28 22:07:51 +02:00
parent 27abe72faa 98ee522fe6
commit fe49146892
8 changed files with 307 additions and 12 deletions
@@ -0,0 +1,192 @@
+#!/usr/bin/env node
+/**
+ * OMP compatibility smoke test.
+ *
+ * Uses an isolated HOME/PI_CODING_AGENT_DIR so the test does not depend on or
+ * mutate the user's real ~/.omp state. The Command Code API base is pointed at
+ * a deterministic local mock server so print mode can exercise the provider
+ * without touching the real API.
+ */
+
+import assert from "node:assert/strict"
+import { spawn } from "node:child_process"
+import { accessSync, constants, mkdtempSync, rmSync } from "node:fs"
+import { createServer } from "node:http"
+import { tmpdir } from "node:os"
+import { delimiter, dirname, join, resolve } from "node:path"
+import { fileURLToPath } from "node:url"
+
+const __dirname = dirname(fileURLToPath(import.meta.url))
+const PROJECT_DIR = resolve(__dirname, "..")
+const EXT_PATH = resolve(PROJECT_DIR, "index.ts")
+const TEST_MODEL = "deepseek/deepseek-v4-flash"
+
+function findOmpBinary() {
+  if (process.env.OMP_BIN) return process.env.OMP_BIN
+  const candidates = (process.env.PATH ?? "").split(delimiter).map((entry) => resolve(entry, "omp"))
+  for (const candidate of candidates) {
+    try {
+      accessSync(candidate, constants.X_OK)
+      return candidate
+    } catch {
+      // Try next PATH entry.
+    }
+  }
+  return undefined
+}
+
+const OMP_BIN = findOmpBinary()
+if (!OMP_BIN) {
+  console.log("[omp-compat] SKIP - omp is not on PATH")
+  process.exit(0)
+}
+
+const tempHome = mkdtempSync(join(tmpdir(), "omp-cc-home-"))
+let requestCount = 0
+let modelListRequestCount = 0
+let lastRequestBody
+let lastRequestHeaders = {}
+
+const server = createServer((req, res) => {
+  if (req.method === "GET" && req.url === "/provider/v1/models") {
+    modelListRequestCount += 1
+    res.writeHead(200, { "Content-Type": "application/json; charset=utf-8" })
+    res.end(
+      JSON.stringify({
+        object: "list",
+        data: [
+          {
+            id: TEST_MODEL,
+            object: "model",
+            created: 1779824324,
+            owned_by: "command-code",
+            name: "DeepSeek V4 Flash",
+            context_length: 1_000_000,
+          },
+          {
+            id: "Qwen/Qwen3.7-Max",
+            object: "model",
+            created: 1779824324,
+            owned_by: "command-code",
+            name: "Qwen 3.7 Max",
+            context_length: 1_000_000,
+          },
+        ],
+      }),
+    )
+    return
+  }
+
+  if (req.method !== "POST" || req.url !== "/alpha/generate") {
+    res.writeHead(404)
+    res.end("Not found")
+    return
+  }
+
+  requestCount += 1
+  lastRequestHeaders = Object.fromEntries(
+    Object.entries(req.headers).map(([key, value]) => [
+      key,
+      Array.isArray(value) ? value.join(", ") : (value ?? ""),
+    ]),
+  )
+
+  let body = ""
+  req.on("data", (chunk) => {
+    body += chunk.toString("utf-8")
+  })
+  req.on("end", () => {
+    try {
+      lastRequestBody = JSON.parse(body)
+    } catch {
+      lastRequestBody = undefined
+    }
+
+    res.writeHead(200, {
+      "Content-Type": "text/plain; charset=utf-8",
+      "Transfer-Encoding": "chunked",
+    })
+    res.write(`${JSON.stringify({ type: "text-delta", text: "mock-omp-ok" })}\n`)
+    res.write(
+      `${JSON.stringify({ type: "finish", finishReason: "stop", totalUsage: { inputTokens: 1, outputTokens: 1 } })}\n`,
+    )
+    res.end()
+  })
+})
+
+await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve))
+const address = server.address()
+const port = typeof address === "object" && address ? address.port : 0
+const apiBase = `http://127.0.0.1:${port}`
+
+function runOmp(args, timeoutMs = 30_000) {
+  return new Promise((resolve) => {
+    const child = spawn(OMP_BIN, args, {
+      cwd: PROJECT_DIR,
+      env: {
+        ...process.env,
+        HOME: tempHome,
+        USERPROFILE: tempHome,
+        PI_CODING_AGENT_DIR: join(tempHome, ".omp", "agent"),
+        COMMANDCODE_API_KEY: "mock-key",
+        COMMANDCODE_API_BASE: apiBase,
+        COMMANDCODE_MODELS_URL: `${apiBase}/provider/v1/models`,
+      },
+      stdio: ["ignore", "pipe", "pipe"],
+    })
+    let stdout = ""
+    let stderr = ""
+    const timer = setTimeout(() => {
+      child.kill()
+      resolve({
+        code: -1,
+        stdout,
+        stderr: `${stderr}\nTIMEOUT after ${timeoutMs}ms`,
+      })
+    }, timeoutMs)
+    child.stdout.on("data", (chunk) => {
+      stdout += chunk.toString("utf-8")
+    })
+    child.stderr.on("data", (chunk) => {
+      stderr += chunk.toString("utf-8")
+    })
+    child.on("close", (code) => {
+      clearTimeout(timer)
+      resolve({ code, stdout, stderr })
+    })
+  })
+}
+
+try {
+  console.log("[omp-compat] list models through real extension")
+  modelListRequestCount = 0
+  const result = await runOmp(["-e", EXT_PATH, "--list-models"])
+  assert.equal(result.code, 0, result.stderr)
+  const listOutput = result.stdout || result.stderr
+  assert.match(listOutput, /commandcode/)
+  assert.match(listOutput, /deepseek\/deepseek-v4-flash/)
+  assert.equal(modelListRequestCount, 1)
+  assert.doesNotMatch(result.stdout + result.stderr, /Failed to load extension/)
+
+  console.log("[omp-compat] print mode through real extension and mock API")
+  requestCount = 0
+  const print = await runOmp(
+    ["-e", EXT_PATH, "-p", "say mock token", "--model", `commandcode/${TEST_MODEL}`],
+    30_000,
+  )
+  assert.equal(print.code, 0, print.stderr)
+  assert.match(print.stdout, /mock-omp-ok/)
+  assert.equal(requestCount, 1)
+  assert.equal(
+    lastRequestHeaders.authorization,
+    "Bearer mock-key",
+    "should send the resolved env-var value, not the literal var name",
+  )
+  assert.equal(lastRequestBody?.params?.model, TEST_MODEL)
+  assert.equal(typeof lastRequestBody?.params?.system, "string")
+
+  console.log("[omp-compat] PASS")
+} finally {
+  await new Promise((resolve) => server.close(resolve))
+  rmSync(tempHome, { recursive: true, force: true })
+}
@@ -136,6 +136,7 @@ function hasLivePiAuth() {
  return (
    !!process.env.COMMANDCODE_API_KEY ||
    existsSync(join(homedir(), ".commandcode", "auth.json")) ||
+    existsSync(join(homedir(), ".omp", "agent", "auth.json")) ||
    existsSync(join(homedir(), ".pi", "agent", "auth.json"))
  )
 }
@@ -294,7 +295,7 @@ try {
  modelListRequestCount = 0
  const list = await runPi(["--no-extensions", "-e", EXT_PATH, "--list-models"], 20_000)
  assert.equal(list.code, 0, list.stderr)
-  const listOutput = `${list.stdout}\n${list.stderr}`
+  const listOutput = list.stdout || list.stderr
  assert.match(listOutput, /commandcode/)
  assert.match(listOutput, /deepseek\/deepseek-v4-flash/)
  assert.match(listOutput, /Qwen\/Qwen3\.7-Max/)
@@ -54,6 +54,27 @@ describe("streamCommandCode — auth", () => {
    assert.equal(server.requestCount(), 0)
  })

+  it("ignores the literal env-var name and falls back to env", async () => {
+    server.mockResponse({
+      type: "success",
+      events: [JSON.stringify({ type: "finish", finishReason: "stop" })],
+    })
+    const { streamCommandCode } = createTestDeps({
+      apiBase: server.baseUrl(),
+      env: { COMMANDCODE_API_KEY: "env-key" },
+    })
+
+    await collectEvents(
+      streamCommandCode(makeModel(), makeContext(), { apiKey: "COMMANDCODE_API_KEY" }),
+    )
+
+    assert.equal(
+      server.lastRequestHeaders().authorization,
+      "Bearer env-key",
+      "should resolve from env, not send the literal var name as the token",
+    )
+  })
+
  it("uses options.apiKey in the Authorization header", async () => {
    server.mockResponse({
      type: "success",
@@ -362,6 +383,29 @@ describe("streamCommandCode — request serialization", () => {
    assert.equal(objectAt(server.lastRequestBody(), ["params", "max_tokens"]), 8_192)
  })

+  it("serializes OMP system prompt arrays as a string", async () => {
+    server.mockResponse({
+      type: "success",
+      events: [JSON.stringify({ type: "finish", finishReason: "stop" })],
+    })
+    const { streamCommandCode } = createTestDeps({ apiBase: server.baseUrl() })
+
+    await collectEvents(
+      streamCommandCode(
+        makeModel(),
+        makeContext({
+          systemPrompt: ["You are a test assistant.", "Use concise answers."] as unknown as string,
+        }),
+        { apiKey: "mock-key" },
+      ),
+    )
+
+    assert.equal(
+      objectAt(server.lastRequestBody(), ["params", "system"]),
+      "You are a test assistant.\n\nUse concise answers.",
+    )
+  })
+
  it("runs onPayload and onResponse hooks", async () => {
    server.mockResponse({
      type: "success",