Merge remote-tracking branch 'origin/dev' into sqlite2

packages/opencode/test/cli/github-action.test.ts

@@ -67,6 +67,18 @@ function createStepStartPart(): MessageV2.Part {
   }
 }
 
+function createStepFinishPart(): MessageV2.Part {
+  return {
+    id: "1",
+    sessionID: "s",
+    messageID: "m",
+    type: "step-finish" as const,
+    reason: "done",
+    cost: 0,
+    tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
+  }
+}
+
 describe("extractResponseText", () => {
   test("returns text from text part", () => {
     const parts = [createTextPart("Hello world")]
@@ -103,18 +115,38 @@ describe("extractResponseText", () => {
     expect(extractResponseText(parts)).toBeNull()
   })
 
-  test("ignores running tool parts (throws since no completed tools)", () => {
+  test("returns null for running tool parts (signals summary needed)", () => {
     const parts = [createToolPart("bash", "", "running")]
-    expect(() => extractResponseText(parts)).toThrow("Failed to parse response")
+    expect(extractResponseText(parts)).toBeNull()
   })
 
-  test("throws with part types on empty array", () => {
-    expect(() => extractResponseText([])).toThrow("Part types found: [none]")
+  test("throws on empty array", () => {
+    expect(() => extractResponseText([])).toThrow("no parts returned")
   })
 
-  test("throws with part types on unhandled parts", () => {
+  test("returns null for step-start only", () => {
     const parts = [createStepStartPart()]
-    expect(() => extractResponseText(parts)).toThrow("Part types found: [step-start]")
+    expect(extractResponseText(parts)).toBeNull()
+  })
+
+  test("returns null for step-finish only", () => {
+    const parts = [createStepFinishPart()]
+    expect(extractResponseText(parts)).toBeNull()
+  })
+
+  test("returns null for step-start and step-finish", () => {
+    const parts = [createStepStartPart(), createStepFinishPart()]
+    expect(extractResponseText(parts)).toBeNull()
+  })
+
+  test("returns text from multi-step response", () => {
+    const parts = [
+      createStepStartPart(),
+      createToolPart("read", "src/file.ts"),
+      createTextPart("Done"),
+      createStepFinishPart(),
+    ]
+    expect(extractResponseText(parts)).toBe("Done")
   })
 
   test("prefers text over reasoning when both present", () => {

packages/opencode/test/cli/import.test.ts

@@ -0,0 +1,38 @@
+import { test, expect } from "bun:test"
+import { parseShareUrl, transformShareData, type ShareData } from "../../src/cli/cmd/import"
+
+// parseShareUrl tests
+test("parses valid share URLs", () => {
+  expect(parseShareUrl("https://opncd.ai/share/Jsj3hNIW")).toBe("Jsj3hNIW")
+  expect(parseShareUrl("https://custom.example.com/share/abc123")).toBe("abc123")
+  expect(parseShareUrl("http://localhost:3000/share/test_id-123")).toBe("test_id-123")
+})
+
+test("rejects invalid URLs", () => {
+  expect(parseShareUrl("https://opncd.ai/s/Jsj3hNIW")).toBeNull() // legacy format
+  expect(parseShareUrl("https://opncd.ai/share/")).toBeNull()
+  expect(parseShareUrl("https://opncd.ai/share/id/extra")).toBeNull()
+  expect(parseShareUrl("not-a-url")).toBeNull()
+})
+
+// transformShareData tests
+test("transforms share data to storage format", () => {
+  const data: ShareData[] = [
+    { type: "session", data: { id: "sess-1", title: "Test" } as any },
+    { type: "message", data: { id: "msg-1", sessionID: "sess-1" } as any },
+    { type: "part", data: { id: "part-1", messageID: "msg-1" } as any },
+    { type: "part", data: { id: "part-2", messageID: "msg-1" } as any },
+  ]
+
+  const result = transformShareData(data)!
+
+  expect(result.info.id).toBe("sess-1")
+  expect(result.messages).toHaveLength(1)
+  expect(result.messages[0].parts).toHaveLength(2)
+})
+
+test("returns null for invalid share data", () => {
+  expect(transformShareData([])).toBeNull()
+  expect(transformShareData([{ type: "message", data: {} as any }])).toBeNull()
+  expect(transformShareData([{ type: "session", data: { id: "s" } as any }])).toBeNull() // no messages
+})

packages/opencode/test/config/config.test.ts

@@ -193,6 +193,25 @@ test("handles file inclusion substitution", async () => {
   })
 })
 
+test("handles file inclusion with replacement tokens", async () => {
+  await using tmp = await tmpdir({
+    init: async (dir) => {
+      await Bun.write(path.join(dir, "included.md"), "const out = await Bun.$`echo hi`")
+      await writeConfig(dir, {
+        $schema: "https://opencode.ai/config.json",
+        theme: "{file:included.md}",
+      })
+    },
+  })
+  await Instance.provide({
+    directory: tmp.path,
+    fn: async () => {
+      const config = await Config.get()
+      expect(config.theme).toBe("const out = await Bun.$`echo hi`")
+    },
+  })
+})
+
 test("validates config schema and throws on invalid fields", async () => {
   await using tmp = await tmpdir({
     init: async (dir) => {

packages/opencode/test/session/prompt-special-chars.test.ts

@@ -0,0 +1,56 @@
+import path from "path"
+import { describe, expect, test } from "bun:test"
+import { fileURLToPath } from "url"
+import { Instance } from "../../src/project/instance"
+import { Log } from "../../src/util/log"
+import { Session } from "../../src/session"
+import { SessionPrompt } from "../../src/session/prompt"
+import { MessageV2 } from "../../src/session/message-v2"
+import { tmpdir } from "../fixture/fixture"
+
+Log.init({ print: false })
+
+describe("session.prompt special characters", () => {
+  test("handles filenames with # character", async () => {
+    await using tmp = await tmpdir({
+      git: true,
+      init: async (dir) => {
+        await Bun.write(path.join(dir, "file#name.txt"), "special content\n")
+      },
+    })
+
+    await Instance.provide({
+      directory: tmp.path,
+      fn: async () => {
+        const session = await Session.create({})
+        const template = "Read @file#name.txt"
+        const parts = await SessionPrompt.resolvePromptParts(template)
+        const fileParts = parts.filter((part) => part.type === "file")
+
+        expect(fileParts.length).toBe(1)
+        expect(fileParts[0].filename).toBe("file#name.txt")
+
+        // Verify the URL is properly encoded (# should be %23)
+        expect(fileParts[0].url).toContain("%23")
+
+        // Verify the URL can be correctly converted back to a file path
+        const decodedPath = fileURLToPath(fileParts[0].url)
+        expect(decodedPath).toBe(path.join(tmp.path, "file#name.txt"))
+
+        const message = await SessionPrompt.prompt({
+          sessionID: session.id,
+          parts,
+          noReply: true,
+        })
+        const stored = await MessageV2.get({ sessionID: session.id, messageID: message.info.id })
+
+        // Verify the file content was read correctly
+        const textParts = stored.parts.filter((part) => part.type === "text")
+        const hasContent = textParts.some((part) => part.text.includes("special content"))
+        expect(hasContent).toBe(true)
+
+        await Session.remove(session.id)
+      },
+    })
+  })
+})

packages/opencode/test/skill/discovery.test.ts

@@ -0,0 +1,60 @@
+import { describe, test, expect } from "bun:test"
+import { Discovery } from "../../src/skill/discovery"
+import path from "path"
+
+const CLOUDFLARE_SKILLS_URL = "https://developers.cloudflare.com/.well-known/skills/"
+
+describe("Discovery.pull", () => {
+  test("downloads skills from cloudflare url", async () => {
+    const dirs = await Discovery.pull(CLOUDFLARE_SKILLS_URL)
+    expect(dirs.length).toBeGreaterThan(0)
+    for (const dir of dirs) {
+      expect(dir).toStartWith(Discovery.dir())
+      const md = path.join(dir, "SKILL.md")
+      expect(await Bun.file(md).exists()).toBe(true)
+    }
+  }, 30_000)
+
+  test("url without trailing slash works", async () => {
+    const dirs = await Discovery.pull(CLOUDFLARE_SKILLS_URL.replace(/\/$/, ""))
+    expect(dirs.length).toBeGreaterThan(0)
+    for (const dir of dirs) {
+      const md = path.join(dir, "SKILL.md")
+      expect(await Bun.file(md).exists()).toBe(true)
+    }
+  }, 30_000)
+
+  test("returns empty array for invalid url", async () => {
+    const dirs = await Discovery.pull("https://example.invalid/.well-known/skills/")
+    expect(dirs).toEqual([])
+  })
+
+  test("returns empty array for non-json response", async () => {
+    const dirs = await Discovery.pull("https://example.com/")
+    expect(dirs).toEqual([])
+  })
+
+  test("downloads reference files alongside SKILL.md", async () => {
+    const dirs = await Discovery.pull(CLOUDFLARE_SKILLS_URL)
+    // find a skill dir that should have reference files (e.g. agents-sdk)
+    const agentsSdk = dirs.find((d) => d.endsWith("/agents-sdk"))
+    if (agentsSdk) {
+      const refs = path.join(agentsSdk, "references")
+      expect(await Bun.file(path.join(agentsSdk, "SKILL.md")).exists()).toBe(true)
+      // agents-sdk has reference files per the index
+      const refDir = await Array.fromAsync(new Bun.Glob("**/*.md").scan({ cwd: refs, onlyFiles: true }))
+      expect(refDir.length).toBeGreaterThan(0)
+    }
+  }, 30_000)
+
+  test("caches downloaded files on second pull", async () => {
+    // first pull to populate cache
+    const first = await Discovery.pull(CLOUDFLARE_SKILLS_URL)
+    expect(first.length).toBeGreaterThan(0)
+
+    // second pull should return same results from cache
+    const second = await Discovery.pull(CLOUDFLARE_SKILLS_URL)
+    expect(second.length).toBe(first.length)
+    expect(second.sort()).toEqual(first.sort())
+  }, 60_000)
+})