-
-
{i18n.t("workspace.lite.promo.title")}
-
- {i18n.t("workspace.lite.promo.description")}
+
+
+ {(part) => {
+ if (part === "{{price}}") return {i18n.t("workspace.lite.promo.price")}
+ return part
+ }}
+
+
{i18n.t("workspace.lite.promo.modelsTitle")}
- Kimi K2.5
diff --git a/packages/console/app/src/routes/workspace/[id]/index.tsx b/packages/console/app/src/routes/workspace/[id]/index.tsx
index c91cfd2bc..b5c597b12 100644
--- a/packages/console/app/src/routes/workspace/[id]/index.tsx
+++ b/packages/console/app/src/routes/workspace/[id]/index.tsx
@@ -1,12 +1,10 @@
-import { Match, Show, Switch, createMemo } from "solid-js"
+import { Show, createMemo } from "solid-js"
import { createStore } from "solid-js/store"
import { createAsync, useParams, useAction, useSubmission } from "@solidjs/router"
import { NewUserSection } from "./new-user-section"
-import { UsageSection } from "./usage-section"
import { ModelSection } from "./model-section"
import { ProviderSection } from "./provider-section"
-import { GraphSection } from "./graph-section"
-import { IconLogo } from "~/component/icon"
+import { IconZen } from "~/component/icon"
import { querySessionInfo, queryBillingInfo, createCheckoutUrl, formatBalance } from "../common"
import { useI18n } from "~/context/i18n"
import { useLanguage } from "~/context/language"
@@ -36,7 +34,7 @@ export default function () {
return (
-
+
{i18n.t("workspace.home.banner.beforeLink")}{" "}
@@ -73,14 +71,10 @@ export default function () {
)
diff --git a/packages/console/app/src/routes/workspace/[id]/graph-section.module.css b/packages/console/app/src/routes/workspace/[id]/usage/graph-section.module.css
similarity index 100%
rename from packages/console/app/src/routes/workspace/[id]/graph-section.module.css
rename to packages/console/app/src/routes/workspace/[id]/usage/graph-section.module.css
diff --git a/packages/console/app/src/routes/workspace/[id]/graph-section.tsx b/packages/console/app/src/routes/workspace/[id]/usage/graph-section.tsx
similarity index 100%
rename from packages/console/app/src/routes/workspace/[id]/graph-section.tsx
rename to packages/console/app/src/routes/workspace/[id]/usage/graph-section.tsx
diff --git a/packages/console/app/src/routes/workspace/[id]/usage/index.tsx b/packages/console/app/src/routes/workspace/[id]/usage/index.tsx
new file mode 100644
index 000000000..3a9c8db29
--- /dev/null
+++ b/packages/console/app/src/routes/workspace/[id]/usage/index.tsx
@@ -0,0 +1,21 @@
+import { Show } from "solid-js"
+import { createAsync, useParams } from "@solidjs/router"
+import { GraphSection } from "./graph-section"
+import { UsageSection } from "./usage-section"
+import { querySessionInfo } from "../../common"
+
+export default function () {
+ const params = useParams()
+ const user = createAsync(() => querySessionInfo(params.id!))
+
+ return (
+
+ )
+}
diff --git a/packages/console/app/src/routes/workspace/[id]/usage-section.module.css b/packages/console/app/src/routes/workspace/[id]/usage/usage-section.module.css
similarity index 100%
rename from packages/console/app/src/routes/workspace/[id]/usage-section.module.css
rename to packages/console/app/src/routes/workspace/[id]/usage/usage-section.module.css
diff --git a/packages/console/app/src/routes/workspace/[id]/usage-section.tsx b/packages/console/app/src/routes/workspace/[id]/usage/usage-section.tsx
similarity index 99%
rename from packages/console/app/src/routes/workspace/[id]/usage-section.tsx
rename to packages/console/app/src/routes/workspace/[id]/usage/usage-section.tsx
index a20a5bf0d..2cf8ef850 100644
--- a/packages/console/app/src/routes/workspace/[id]/usage-section.tsx
+++ b/packages/console/app/src/routes/workspace/[id]/usage/usage-section.tsx
@@ -1,7 +1,7 @@
import { Billing } from "@opencode-ai/console-core/billing.js"
import { createAsync, query, useParams } from "@solidjs/router"
import { createMemo, For, Show, Switch, Match, createEffect, createSignal } from "solid-js"
-import { formatDateUTC, formatDateForTable } from "../common"
+import { formatDateUTC, formatDateForTable } from "../../common"
import { withActor } from "~/context/auth.withActor"
import { IconChevronLeft, IconChevronRight, IconBreakdown } from "~/component/icon"
import styles from "./usage-section.module.css"
diff --git a/packages/console/app/src/routes/zen/index.tsx b/packages/console/app/src/routes/zen/index.tsx
index 5b5581b53..62e8f5d37 100644
--- a/packages/console/app/src/routes/zen/index.tsx
+++ b/packages/console/app/src/routes/zen/index.tsx
@@ -24,8 +24,7 @@ import { LocaleLinks } from "~/component/locale-links"
const checkLoggedIn = query(async () => {
"use server"
- const workspaceID = await getLastSeenWorkspaceID().catch(() => {})
- if (workspaceID) throw redirect(`/workspace/${workspaceID}`)
+ return await getLastSeenWorkspaceID().catch(() => {})
}, "checkLoggedIn.get")
export default function Home() {
diff --git a/packages/console/core/src/billing.ts b/packages/console/core/src/billing.ts
index fcf238a35..cbb3f2d74 100644
--- a/packages/console/core/src/billing.ts
+++ b/packages/console/core/src/billing.ts
@@ -212,13 +212,16 @@ export namespace Billing {
invoice_creation: {
enabled: true,
},
- payment_intent_data: {
- setup_future_usage: "on_session",
- },
- payment_method_types: ["card"],
- payment_method_data: {
- allow_redisplay: "always",
+ payment_method_options: {
+ alipay: {},
+ card: {
+ setup_future_usage: "on_session",
+ },
},
+ payment_method_types: ["card", "alipay"],
+ //payment_method_data: {
+ // allow_redisplay: "always",
+ //},
tax_id_collection: {
enabled: true,
},
@@ -253,6 +256,7 @@ export namespace Billing {
mode: "subscription",
billing_address_collection: "required",
line_items: [{ price: LiteData.priceID(), quantity: 1 }],
+ discounts: [{ coupon: LiteData.firstMonth50Coupon() }],
...(billing.customerID
? {
customer: billing.customerID,
@@ -265,7 +269,7 @@ export namespace Billing {
customer_email: email!,
}),
currency: "usd",
- payment_method_types: ["card"],
+ payment_method_types: ["card", "alipay"],
tax_id_collection: {
enabled: true,
},
diff --git a/packages/console/core/src/lite.ts b/packages/console/core/src/lite.ts
index c6f7d5a3e..8c5b63d0c 100644
--- a/packages/console/core/src/lite.ts
+++ b/packages/console/core/src/lite.ts
@@ -10,5 +10,6 @@ export namespace LiteData {
export const productID = fn(z.void(), () => Resource.ZEN_LITE_PRICE.product)
export const priceID = fn(z.void(), () => Resource.ZEN_LITE_PRICE.price)
+ export const firstMonth50Coupon = fn(z.void(), () => Resource.ZEN_LITE_PRICE.firstMonth50Coupon)
export const planName = fn(z.void(), () => "lite")
}
diff --git a/packages/console/core/sst-env.d.ts b/packages/console/core/sst-env.d.ts
index 23ae6e44b..d00d0c32f 100644
--- a/packages/console/core/sst-env.d.ts
+++ b/packages/console/core/sst-env.d.ts
@@ -131,6 +131,7 @@ declare module "sst" {
"value": string
}
"ZEN_LITE_PRICE": {
+ "firstMonth50Coupon": string
"price": string
"product": string
"type": "sst.sst.Linkable"
diff --git a/packages/console/function/sst-env.d.ts b/packages/console/function/sst-env.d.ts
index 23ae6e44b..d00d0c32f 100644
--- a/packages/console/function/sst-env.d.ts
+++ b/packages/console/function/sst-env.d.ts
@@ -131,6 +131,7 @@ declare module "sst" {
"value": string
}
"ZEN_LITE_PRICE": {
+ "firstMonth50Coupon": string
"price": string
"product": string
"type": "sst.sst.Linkable"
diff --git a/packages/console/resource/sst-env.d.ts b/packages/console/resource/sst-env.d.ts
index 23ae6e44b..d00d0c32f 100644
--- a/packages/console/resource/sst-env.d.ts
+++ b/packages/console/resource/sst-env.d.ts
@@ -131,6 +131,7 @@ declare module "sst" {
"value": string
}
"ZEN_LITE_PRICE": {
+ "firstMonth50Coupon": string
"price": string
"product": string
"type": "sst.sst.Linkable"
diff --git a/packages/desktop-electron/scripts/finalize-latest-yml.ts b/packages/desktop-electron/scripts/finalize-latest-yml.ts
index 42ec23b64..aa2ae5c96 100644
--- a/packages/desktop-electron/scripts/finalize-latest-yml.ts
+++ b/packages/desktop-electron/scripts/finalize-latest-yml.ts
@@ -78,9 +78,17 @@ async function read(subdir: string, filename: string): Promise = {}
-// Windows: single arch, pass through
-const win = await read("latest-yml-x86_64-pc-windows-msvc", "latest.yml")
-if (win) output["latest.yml"] = serialize(win)
+// Windows: merge arm64 + x64 into single file
+const winX64 = await read("latest-yml-x86_64-pc-windows-msvc", "latest.yml")
+const winArm64 = await read("latest-yml-aarch64-pc-windows-msvc", "latest.yml")
+if (winX64 || winArm64) {
+ const base = winArm64 ?? winX64!
+ output["latest.yml"] = serialize({
+ version: base.version,
+ files: [...(winArm64?.files ?? []), ...(winX64?.files ?? [])],
+ releaseDate: base.releaseDate,
+ })
+}
// Linux x64: pass through
const linuxX64 = await read("latest-yml-x86_64-unknown-linux-gnu", "latest-linux.yml")
diff --git a/packages/desktop-electron/scripts/utils.ts b/packages/desktop-electron/scripts/utils.ts
index 4c9af1fc7..1c0add87d 100644
--- a/packages/desktop-electron/scripts/utils.ts
+++ b/packages/desktop-electron/scripts/utils.ts
@@ -19,6 +19,11 @@ export const SIDECAR_BINARIES: Array<{ rustTarget: string; ocBinary: string; ass
ocBinary: "opencode-darwin-x64-baseline",
assetExt: "zip",
},
+ {
+ rustTarget: "aarch64-pc-windows-msvc",
+ ocBinary: "opencode-windows-arm64",
+ assetExt: "zip",
+ },
{
rustTarget: "x86_64-pc-windows-msvc",
ocBinary: "opencode-windows-x64-baseline",
@@ -41,7 +46,7 @@ export const RUST_TARGET = Bun.env.RUST_TARGET
function nativeTarget() {
const { platform, arch } = process
if (platform === "darwin") return arch === "arm64" ? "aarch64-apple-darwin" : "x86_64-apple-darwin"
- if (platform === "win32") return "x86_64-pc-windows-msvc"
+ if (platform === "win32") return arch === "arm64" ? "aarch64-pc-windows-msvc" : "x86_64-pc-windows-msvc"
if (platform === "linux") return arch === "arm64" ? "aarch64-unknown-linux-gnu" : "x86_64-unknown-linux-gnu"
throw new Error(`Unsupported platform: ${platform}/${arch}`)
}
diff --git a/packages/desktop/scripts/finalize-latest-json.ts b/packages/desktop/scripts/finalize-latest-json.ts
index 5445e0640..a2b95d2c4 100644
--- a/packages/desktop/scripts/finalize-latest-json.ts
+++ b/packages/desktop/scripts/finalize-latest-json.ts
@@ -101,6 +101,7 @@ const targets = [
{ key: "linux-x86_64-rpm", asset: "opencode-desktop-linux-x86_64.rpm" },
{ key: "linux-aarch64-deb", asset: "opencode-desktop-linux-arm64.deb" },
{ key: "linux-aarch64-rpm", asset: "opencode-desktop-linux-aarch64.rpm" },
+ { key: "windows-aarch64-nsis", asset: "opencode-desktop-windows-arm64.exe" },
{ key: "windows-x86_64-nsis", asset: "opencode-desktop-windows-x64.exe" },
{ key: "darwin-x86_64-app", asset: "opencode-desktop-darwin-x64.app.tar.gz" },
{
@@ -129,6 +130,7 @@ const alias = (key: string, source: string) => {
alias("linux-x86_64", "linux-x86_64-deb")
alias("linux-aarch64", "linux-aarch64-deb")
+alias("windows-aarch64", "windows-aarch64-nsis")
alias("windows-x86_64", "windows-x86_64-nsis")
alias("darwin-x86_64", "darwin-x86_64-app")
alias("darwin-aarch64", "darwin-aarch64-app")
diff --git a/packages/desktop/scripts/utils.ts b/packages/desktop/scripts/utils.ts
index 2629eb466..06ff25946 100644
--- a/packages/desktop/scripts/utils.ts
+++ b/packages/desktop/scripts/utils.ts
@@ -11,6 +11,11 @@ export const SIDECAR_BINARIES: Array<{ rustTarget: string; ocBinary: string; ass
ocBinary: "opencode-darwin-x64-baseline",
assetExt: "zip",
},
+ {
+ rustTarget: "aarch64-pc-windows-msvc",
+ ocBinary: "opencode-windows-arm64",
+ assetExt: "zip",
+ },
{
rustTarget: "x86_64-pc-windows-msvc",
ocBinary: "opencode-windows-x64-baseline",
diff --git a/packages/enterprise/sst-env.d.ts b/packages/enterprise/sst-env.d.ts
index 23ae6e44b..d00d0c32f 100644
--- a/packages/enterprise/sst-env.d.ts
+++ b/packages/enterprise/sst-env.d.ts
@@ -131,6 +131,7 @@ declare module "sst" {
"value": string
}
"ZEN_LITE_PRICE": {
+ "firstMonth50Coupon": string
"price": string
"product": string
"type": "sst.sst.Linkable"
diff --git a/packages/function/sst-env.d.ts b/packages/function/sst-env.d.ts
index 23ae6e44b..d00d0c32f 100644
--- a/packages/function/sst-env.d.ts
+++ b/packages/function/sst-env.d.ts
@@ -131,6 +131,7 @@ declare module "sst" {
"value": string
}
"ZEN_LITE_PRICE": {
+ "firstMonth50Coupon": string
"price": string
"product": string
"type": "sst.sst.Linkable"
diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index fe991ad8a..e277977f7 100644
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -36,6 +36,7 @@
"@parcel/watcher-linux-arm64-musl": "2.5.1",
"@parcel/watcher-linux-x64-glibc": "2.5.1",
"@parcel/watcher-linux-x64-musl": "2.5.1",
+ "@parcel/watcher-win32-arm64": "2.5.1",
"@parcel/watcher-win32-x64": "2.5.1",
"@standard-schema/spec": "1.0.0",
"@tsconfig/bun": "catalog:",
diff --git a/packages/opencode/script/build.ts b/packages/opencode/script/build.ts
index 8d84b206d..c6a83eb73 100755
--- a/packages/opencode/script/build.ts
+++ b/packages/opencode/script/build.ts
@@ -108,6 +108,10 @@ const allTargets: {
arch: "x64",
avx2: false,
},
+ {
+ os: "win32",
+ arch: "arm64",
+ },
{
os: "win32",
arch: "x64",
diff --git a/packages/opencode/script/seed-e2e.ts b/packages/opencode/script/seed-e2e.ts
index ba2155cb6..78bbca286 100644
--- a/packages/opencode/script/seed-e2e.ts
+++ b/packages/opencode/script/seed-e2e.ts
@@ -11,7 +11,7 @@ const seed = async () => {
const { Instance } = await import("../src/project/instance")
const { InstanceBootstrap } = await import("../src/project/bootstrap")
const { Session } = await import("../src/session")
- const { Identifier } = await import("../src/id/id")
+ const { MessageID, PartID } = await import("../src/session/schema")
const { Project } = await import("../src/project/project")
await Instance.provide({
@@ -19,8 +19,8 @@ const seed = async () => {
init: InstanceBootstrap,
fn: async () => {
const session = await Session.create({ title })
- const messageID = Identifier.descending("message")
- const partID = Identifier.descending("part")
+ const messageID = MessageID.ascending()
+ const partID = PartID.ascending()
const message = {
id: messageID,
sessionID: session.id,
diff --git a/packages/opencode/src/account/schema.ts b/packages/opencode/src/account/schema.ts
index 6b62484ab..9b31c4ba6 100644
--- a/packages/opencode/src/account/schema.ts
+++ b/packages/opencode/src/account/schema.ts
@@ -3,13 +3,13 @@ import { Schema } from "effect"
import { withStatics } from "@/util/schema"
export const AccountID = Schema.String.pipe(
- Schema.brand("AccountId"),
+ Schema.brand("AccountID"),
withStatics((s) => ({ make: (id: string) => s.makeUnsafe(id) })),
)
export type AccountID = Schema.Schema.Type
export const OrgID = Schema.String.pipe(
- Schema.brand("OrgId"),
+ Schema.brand("OrgID"),
withStatics((s) => ({ make: (id: string) => s.makeUnsafe(id) })),
)
export type OrgID = Schema.Schema.Type
diff --git a/packages/opencode/src/cli/cmd/debug/agent.ts b/packages/opencode/src/cli/cmd/debug/agent.ts
index fe3003485..297a7ec02 100644
--- a/packages/opencode/src/cli/cmd/debug/agent.ts
+++ b/packages/opencode/src/cli/cmd/debug/agent.ts
@@ -4,7 +4,7 @@ import { Agent } from "../../../agent/agent"
import { Provider } from "../../../provider/provider"
import { Session } from "../../../session"
import type { MessageV2 } from "../../../session/message-v2"
-import { Identifier } from "../../../id/id"
+import { MessageID, PartID } from "../../../session/schema"
import { ToolRegistry } from "../../../tool/registry"
import { Instance } from "../../../project/instance"
import { PermissionNext } from "../../../permission/next"
@@ -113,7 +113,7 @@ function parseToolParams(input?: string) {
async function createToolContext(agent: Agent.Info) {
const session = await Session.create({ title: `Debug tool run (${agent.name})` })
- const messageID = Identifier.ascending("message")
+ const messageID = MessageID.ascending()
const model = agent.model ?? (await Provider.defaultModel())
const now = Date.now()
const message: MessageV2.Assistant = {
@@ -150,7 +150,7 @@ async function createToolContext(agent: Agent.Info) {
return {
sessionID: session.id,
messageID,
- callID: Identifier.ascending("part"),
+ callID: PartID.ascending(),
agent: agent.name,
abort: new AbortController().signal,
messages: [],
diff --git a/packages/opencode/src/cli/cmd/export.ts b/packages/opencode/src/cli/cmd/export.ts
index 20c95bf87..4088b4818 100644
--- a/packages/opencode/src/cli/cmd/export.ts
+++ b/packages/opencode/src/cli/cmd/export.ts
@@ -1,5 +1,6 @@
import type { Argv } from "yargs"
import { Session } from "../../session"
+import { SessionID } from "../../session/schema"
import { cmd } from "./cmd"
import { bootstrap } from "../bootstrap"
import { UI } from "../ui"
@@ -17,7 +18,7 @@ export const ExportCommand = cmd({
},
handler: async (args) => {
await bootstrap(process.cwd(), async () => {
- let sessionID = args.sessionID
+ let sessionID = args.sessionID ? SessionID.make(args.sessionID) : undefined
process.stderr.write(`Exporting session: ${sessionID ?? "latest"}\n`)
if (!sessionID) {
@@ -58,7 +59,7 @@ export const ExportCommand = cmd({
throw new UI.CancelledError()
}
- sessionID = selectedSession as string
+ sessionID = selectedSession
prompts.outro("Exporting session...", {
output: process.stderr,
@@ -67,7 +68,7 @@ export const ExportCommand = cmd({
try {
const sessionInfo = await Session.get(sessionID!)
- const messages = await Session.messages({ sessionID: sessionID! })
+ const messages = await Session.messages({ sessionID: sessionInfo.id })
const exportData = {
info: sessionInfo,
diff --git a/packages/opencode/src/cli/cmd/github.ts b/packages/opencode/src/cli/cmd/github.ts
index a58151308..edd9d7561 100644
--- a/packages/opencode/src/cli/cmd/github.ts
+++ b/packages/opencode/src/cli/cmd/github.ts
@@ -22,7 +22,8 @@ import { ModelsDev } from "../../provider/models"
import { Instance } from "@/project/instance"
import { bootstrap } from "../bootstrap"
import { Session } from "../../session"
-import { Identifier } from "../../id/id"
+import type { SessionID } from "../../session/schema"
+import { MessageID, PartID } from "../../session/schema"
import { Provider } from "../../provider/provider"
import { Bus } from "../../bus"
import { MessageV2 } from "../../session/message-v2"
@@ -481,7 +482,7 @@ export const GithubRunCommand = cmd({
let octoRest: Octokit
let octoGraph: typeof graphql
let gitConfig: string
- let session: { id: string; title: string; version: string }
+ let session: { id: SessionID; title: string; version: string }
let shareId: string | undefined
let exitCode = 0
type PromptFiles = Awaited>["promptFiles"]
@@ -934,7 +935,7 @@ export const GithubRunCommand = cmd({
const result = await SessionPrompt.prompt({
sessionID: session.id,
- messageID: Identifier.ascending("message"),
+ messageID: MessageID.ascending(),
variant,
model: {
providerID,
@@ -943,13 +944,13 @@ export const GithubRunCommand = cmd({
// agent is omitted - server will use default_agent from config or fall back to "build"
parts: [
{
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
type: "text",
text: message,
},
...files.flatMap((f) => [
{
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
type: "file" as const,
mime: f.mime,
url: `data:${f.mime};base64,${f.content}`,
@@ -988,7 +989,7 @@ export const GithubRunCommand = cmd({
console.log("Requesting summary from agent...")
const summary = await SessionPrompt.prompt({
sessionID: session.id,
- messageID: Identifier.ascending("message"),
+ messageID: MessageID.ascending(),
variant,
model: {
providerID,
@@ -997,7 +998,7 @@ export const GithubRunCommand = cmd({
tools: { "*": false }, // Disable all tools to force text response
parts: [
{
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
type: "text",
text: "Summarize the actions (tool calls & reasoning) you did for the user in 1-2 sentences.",
},
diff --git a/packages/opencode/src/cli/cmd/import.ts b/packages/opencode/src/cli/cmd/import.ts
index cfea5fdbb..8bd24cfec 100644
--- a/packages/opencode/src/cli/cmd/import.ts
+++ b/packages/opencode/src/cli/cmd/import.ts
@@ -1,6 +1,8 @@
import type { Argv } from "yargs"
import type { Session as SDKSession, Message, Part } from "@opencode-ai/sdk/v2"
import { Session } from "../../session"
+import { SessionID, MessageID, PartID } from "../../session/schema"
+import { WorkspaceID } from "../../control-plane/schema"
import { cmd } from "./cmd"
import { bootstrap } from "../bootstrap"
import { Database } from "../../storage/db"
@@ -152,7 +154,20 @@ export const ImportCommand = cmd({
return
}
- const row = Session.toRow({ ...exportData.info, projectID: Instance.project.id })
+ const row = Session.toRow({
+ ...exportData.info,
+ id: SessionID.make(exportData.info.id),
+ parentID: exportData.info.parentID ? SessionID.make(exportData.info.parentID) : undefined,
+ workspaceID: exportData.info.workspaceID ? WorkspaceID.make(exportData.info.workspaceID) : undefined,
+ projectID: Instance.project.id,
+ revert: exportData.info.revert
+ ? {
+ ...exportData.info.revert,
+ messageID: MessageID.make(exportData.info.revert.messageID),
+ partID: exportData.info.revert.partID ? PartID.make(exportData.info.revert.partID) : undefined,
+ }
+ : undefined,
+ })
Database.use((db) =>
db
.insert(SessionTable)
@@ -162,28 +177,30 @@ export const ImportCommand = cmd({
)
for (const msg of exportData.messages) {
+ const { id: _mid, sessionID: _msid, ...msgData } = msg.info
Database.use((db) =>
db
.insert(MessageTable)
.values({
- id: msg.info.id,
- session_id: exportData.info.id,
+ id: MessageID.make(msg.info.id),
+ session_id: row.id,
time_created: msg.info.time?.created ?? Date.now(),
- data: msg.info,
+ data: msgData,
})
.onConflictDoNothing()
.run(),
)
for (const part of msg.parts) {
+ const { id: _pid, sessionID: _psid, messageID: _pmid, ...partData } = part
Database.use((db) =>
db
.insert(PartTable)
.values({
- id: part.id,
- message_id: msg.info.id,
- session_id: exportData.info.id,
- data: part,
+ id: PartID.make(part.id),
+ message_id: MessageID.make(msg.info.id),
+ session_id: row.id,
+ data: partData,
})
.onConflictDoNothing()
.run(),
diff --git a/packages/opencode/src/cli/cmd/session.ts b/packages/opencode/src/cli/cmd/session.ts
index 84840392a..8acd7480c 100644
--- a/packages/opencode/src/cli/cmd/session.ts
+++ b/packages/opencode/src/cli/cmd/session.ts
@@ -1,6 +1,7 @@
import type { Argv } from "yargs"
import { cmd } from "./cmd"
import { Session } from "../../session"
+import { SessionID } from "../../session/schema"
import { bootstrap } from "../bootstrap"
import { UI } from "../ui"
import { Locale } from "../../util/locale"
@@ -57,13 +58,14 @@ export const SessionDeleteCommand = cmd({
},
handler: async (args) => {
await bootstrap(process.cwd(), async () => {
+ const sessionID = SessionID.make(args.sessionID)
try {
- await Session.get(args.sessionID)
+ await Session.get(sessionID)
} catch {
UI.error(`Session not found: ${args.sessionID}`)
process.exit(1)
}
- await Session.remove(args.sessionID)
+ await Session.remove(sessionID)
UI.println(UI.Style.TEXT_SUCCESS_BOLD + `Session ${args.sessionID} deleted` + UI.Style.TEXT_NORMAL)
})
},
diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
index 2d99051fb..c85426cc2 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -9,7 +9,7 @@ import { EmptyBorder } from "@tui/component/border"
import { useSDK } from "@tui/context/sdk"
import { useRoute } from "@tui/context/route"
import { useSync } from "@tui/context/sync"
-import { Identifier } from "@/id/id"
+import { MessageID, PartID } from "@/session/schema"
import { createStore, produce } from "solid-js/store"
import { useKeybind } from "@tui/context/keybind"
import { usePromptHistory, type PromptInfo } from "./history"
@@ -561,7 +561,7 @@ export function Prompt(props: PromptProps) {
sessionID = res.data.id
}
- const messageID = Identifier.ascending("message")
+ const messageID = MessageID.ascending()
let inputText = store.prompt.input
// Expand pasted text inline before submitting
@@ -624,7 +624,7 @@ export function Prompt(props: PromptProps) {
parts: nonTextParts
.filter((x) => x.type === "file")
.map((x) => ({
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
...x,
})),
})
@@ -639,12 +639,12 @@ export function Prompt(props: PromptProps) {
variant,
parts: [
{
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
type: "text",
text: inputText,
},
...nonTextParts.map((x) => ({
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
...x,
})),
],
diff --git a/packages/opencode/src/cli/cmd/tui/event.ts b/packages/opencode/src/cli/cmd/tui/event.ts
index 9466ae54f..b2e4b92c5 100644
--- a/packages/opencode/src/cli/cmd/tui/event.ts
+++ b/packages/opencode/src/cli/cmd/tui/event.ts
@@ -1,5 +1,6 @@
import { BusEvent } from "@/bus/bus-event"
import { Bus } from "@/bus"
+import { SessionID } from "@/session/schema"
import z from "zod"
export const TuiEvent = {
@@ -42,7 +43,7 @@ export const TuiEvent = {
SessionSelect: BusEvent.define(
"tui.session.select",
z.object({
- sessionID: z.string().regex(/^ses/).describe("Session ID to navigate to"),
+ sessionID: SessionID.zod.describe("Session ID to navigate to"),
}),
),
}
diff --git a/packages/opencode/src/command/index.ts b/packages/opencode/src/command/index.ts
index dce7ac8bb..2c47984fd 100644
--- a/packages/opencode/src/command/index.ts
+++ b/packages/opencode/src/command/index.ts
@@ -1,4 +1,5 @@
import { BusEvent } from "@/bus/bus-event"
+import { SessionID, MessageID } from "@/session/schema"
import z from "zod"
import { Config } from "../config/config"
import { Instance } from "../project/instance"
@@ -14,9 +15,9 @@ export namespace Command {
"command.executed",
z.object({
name: z.string(),
- sessionID: Identifier.schema("session"),
+ sessionID: SessionID.zod,
arguments: z.string(),
- messageID: Identifier.schema("message"),
+ messageID: MessageID.zod,
}),
),
}
diff --git a/packages/opencode/src/control-plane/schema.ts b/packages/opencode/src/control-plane/schema.ts
new file mode 100644
index 000000000..7618f46ad
--- /dev/null
+++ b/packages/opencode/src/control-plane/schema.ts
@@ -0,0 +1,17 @@
+import { Schema } from "effect"
+import z from "zod"
+
+import { withStatics } from "@/util/schema"
+import { Identifier } from "@/id/id"
+
+const workspaceIdSchema = Schema.String.pipe(Schema.brand("WorkspaceID"))
+
+export type WorkspaceID = typeof workspaceIdSchema.Type
+
+export const WorkspaceID = workspaceIdSchema.pipe(
+ withStatics((schema: typeof workspaceIdSchema) => ({
+ make: (id: string) => schema.makeUnsafe(id),
+ ascending: (id?: string) => schema.makeUnsafe(Identifier.ascending("workspace", id)),
+ zod: Identifier.schema("workspace").pipe(z.custom()),
+ })),
+)
diff --git a/packages/opencode/src/control-plane/types.ts b/packages/opencode/src/control-plane/types.ts
index 53a6c8a07..ab628a693 100644
--- a/packages/opencode/src/control-plane/types.ts
+++ b/packages/opencode/src/control-plane/types.ts
@@ -1,9 +1,9 @@
import z from "zod"
-import { Identifier } from "@/id/id"
import { ProjectID } from "@/project/schema"
+import { WorkspaceID } from "./schema"
export const WorkspaceInfo = z.object({
- id: Identifier.schema("workspace"),
+ id: WorkspaceID.zod,
type: z.string(),
branch: z.string().nullable(),
name: z.string().nullable(),
diff --git a/packages/opencode/src/control-plane/workspace-context.ts b/packages/opencode/src/control-plane/workspace-context.ts
index f7297b3f4..cdd975dc4 100644
--- a/packages/opencode/src/control-plane/workspace-context.ts
+++ b/packages/opencode/src/control-plane/workspace-context.ts
@@ -1,13 +1,14 @@
import { Context } from "../util/context"
+import type { WorkspaceID } from "./schema"
interface Context {
- workspaceID?: string
+ workspaceID?: WorkspaceID
}
const context = Context.create("workspace")
export const WorkspaceContext = {
- async provide(input: { workspaceID?: string; fn: () => R }): Promise {
+ async provide(input: { workspaceID?: WorkspaceID; fn: () => R }): Promise {
return context.provide({ workspaceID: input.workspaceID }, async () => {
return input.fn()
})
diff --git a/packages/opencode/src/control-plane/workspace-server/server.ts b/packages/opencode/src/control-plane/workspace-server/server.ts
index fd7fd9308..b0744fe02 100644
--- a/packages/opencode/src/control-plane/workspace-server/server.ts
+++ b/packages/opencode/src/control-plane/workspace-server/server.ts
@@ -4,6 +4,7 @@ import { InstanceBootstrap } from "../../project/bootstrap"
import { SessionRoutes } from "../../server/routes/session"
import { WorkspaceServerRoutes } from "./routes"
import { WorkspaceContext } from "../workspace-context"
+import { WorkspaceID } from "../schema"
export namespace WorkspaceServer {
export function App() {
@@ -20,9 +21,9 @@ export namespace WorkspaceServer {
return new Hono()
.use(async (c, next) => {
- const workspaceID = c.req.query("workspace") || c.req.header("x-opencode-workspace")
+ const rawWorkspaceID = c.req.query("workspace") || c.req.header("x-opencode-workspace")
const raw = c.req.query("directory") || c.req.header("x-opencode-directory")
- if (workspaceID == null) {
+ if (rawWorkspaceID == null) {
throw new Error("workspaceID parameter is required")
}
if (raw == null) {
@@ -38,7 +39,7 @@ export namespace WorkspaceServer {
})()
return WorkspaceContext.provide({
- workspaceID,
+ workspaceID: WorkspaceID.make(rawWorkspaceID),
async fn() {
return Instance.provide({
directory,
diff --git a/packages/opencode/src/control-plane/workspace.sql.ts b/packages/opencode/src/control-plane/workspace.sql.ts
index eb7d21d1e..272907da1 100644
--- a/packages/opencode/src/control-plane/workspace.sql.ts
+++ b/packages/opencode/src/control-plane/workspace.sql.ts
@@ -1,9 +1,10 @@
import { sqliteTable, text } from "drizzle-orm/sqlite-core"
import { ProjectTable } from "../project/project.sql"
import type { ProjectID } from "../project/schema"
+import type { WorkspaceID } from "./schema"
export const WorkspaceTable = sqliteTable("workspace", {
- id: text().primaryKey(),
+ id: text().$type().primaryKey(),
type: text().notNull(),
branch: text(),
name: text(),
diff --git a/packages/opencode/src/control-plane/workspace.ts b/packages/opencode/src/control-plane/workspace.ts
index f3af985ca..c3c28ed60 100644
--- a/packages/opencode/src/control-plane/workspace.ts
+++ b/packages/opencode/src/control-plane/workspace.ts
@@ -1,5 +1,4 @@
import z from "zod"
-import { Identifier } from "@/id/id"
import { fn } from "@/util/fn"
import { Database, eq } from "@/storage/db"
import { Project } from "@/project/project"
@@ -10,6 +9,7 @@ import { ProjectID } from "@/project/schema"
import { WorkspaceTable } from "./workspace.sql"
import { getAdaptor } from "./adaptors"
import { WorkspaceInfo } from "./types"
+import { WorkspaceID } from "./schema"
import { parseSSE } from "./sse"
export namespace Workspace {
@@ -46,7 +46,7 @@ export namespace Workspace {
}
const CreateInput = z.object({
- id: Identifier.schema("workspace").optional(),
+ id: WorkspaceID.zod.optional(),
type: Info.shape.type,
branch: Info.shape.branch,
projectID: ProjectID.zod,
@@ -54,7 +54,7 @@ export namespace Workspace {
})
export const create = fn(CreateInput, async (input) => {
- const id = Identifier.ascending("workspace", input.id)
+ const id = WorkspaceID.ascending(input.id)
const adaptor = await getAdaptor(input.type)
const config = await adaptor.configure({ ...input, id, name: null, directory: null })
@@ -94,13 +94,13 @@ export namespace Workspace {
return rows.map(fromRow).sort((a, b) => a.id.localeCompare(b.id))
}
- export const get = fn(Identifier.schema("workspace"), async (id) => {
+ export const get = fn(WorkspaceID.zod, async (id) => {
const row = Database.use((db) => db.select().from(WorkspaceTable).where(eq(WorkspaceTable.id, id)).get())
if (!row) return
return fromRow(row)
})
- export const remove = fn(Identifier.schema("workspace"), async (id) => {
+ export const remove = fn(WorkspaceID.zod, async (id) => {
const row = Database.use((db) => db.select().from(WorkspaceTable).where(eq(WorkspaceTable.id, id)).get())
if (row) {
const info = fromRow(row)
diff --git a/packages/opencode/src/file/ripgrep.ts b/packages/opencode/src/file/ripgrep.ts
index b1068f5d8..601c82e94 100644
--- a/packages/opencode/src/file/ripgrep.ts
+++ b/packages/opencode/src/file/ripgrep.ts
@@ -100,6 +100,7 @@ export namespace Ripgrep {
},
"x64-darwin": { platform: "x86_64-apple-darwin", extension: "tar.gz" },
"x64-linux": { platform: "x86_64-unknown-linux-musl", extension: "tar.gz" },
+ "arm64-win32": { platform: "aarch64-pc-windows-msvc", extension: "zip" },
"x64-win32": { platform: "x86_64-pc-windows-msvc", extension: "zip" },
} as const
diff --git a/packages/opencode/src/permission/index.ts b/packages/opencode/src/permission/index.ts
index f1cd43fdb..d8283a1fa 100644
--- a/packages/opencode/src/permission/index.ts
+++ b/packages/opencode/src/permission/index.ts
@@ -1,11 +1,12 @@
import { BusEvent } from "@/bus/bus-event"
import { Bus } from "@/bus"
+import { SessionID, MessageID } from "@/session/schema"
import z from "zod"
import { Log } from "../util/log"
-import { Identifier } from "../id/id"
import { Plugin } from "../plugin"
import { Instance } from "../project/instance"
import { Wildcard } from "../util/wildcard"
+import { PermissionID } from "./schema"
export namespace Permission {
const log = Log.create({ service: "permission" })
@@ -21,11 +22,11 @@ export namespace Permission {
export const Info = z
.object({
- id: z.string(),
+ id: PermissionID.zod,
type: z.string(),
pattern: z.union([z.string(), z.array(z.string())]).optional(),
- sessionID: z.string(),
- messageID: z.string(),
+ sessionID: SessionID.zod,
+ messageID: MessageID.zod,
callID: z.string().optional(),
message: z.string(),
metadata: z.record(z.string(), z.any()),
@@ -43,8 +44,8 @@ export namespace Permission {
Replied: BusEvent.define(
"permission.replied",
z.object({
- sessionID: z.string(),
- permissionID: z.string(),
+ sessionID: SessionID.zod,
+ permissionID: PermissionID.zod,
response: z.string(),
}),
),
@@ -117,7 +118,7 @@ export namespace Permission {
const keys = toKeys(input.pattern, input.type)
if (covered(keys, approvedForSession)) return
const info: Info = {
- id: Identifier.ascending("permission"),
+ id: PermissionID.ascending(),
type: input.type,
pattern: input.pattern,
sessionID: input.sessionID,
diff --git a/packages/opencode/src/permission/next.ts b/packages/opencode/src/permission/next.ts
index 4e47e43c8..9b8910144 100644
--- a/packages/opencode/src/permission/next.ts
+++ b/packages/opencode/src/permission/next.ts
@@ -1,7 +1,8 @@
import { Bus } from "@/bus"
import { BusEvent } from "@/bus/bus-event"
import { Config } from "@/config/config"
-import { Identifier } from "@/id/id"
+import { SessionID, MessageID } from "@/session/schema"
+import { PermissionID } from "./schema"
import { Instance } from "@/project/instance"
import { Database, eq } from "@/storage/db"
import { PermissionTable } from "@/session/session.sql"
@@ -68,15 +69,15 @@ export namespace PermissionNext {
export const Request = z
.object({
- id: Identifier.schema("permission"),
- sessionID: Identifier.schema("session"),
+ id: PermissionID.zod,
+ sessionID: SessionID.zod,
permission: z.string(),
patterns: z.string().array(),
metadata: z.record(z.string(), z.any()),
always: z.string().array(),
tool: z
.object({
- messageID: z.string(),
+ messageID: MessageID.zod,
callID: z.string(),
})
.optional(),
@@ -100,8 +101,8 @@ export namespace PermissionNext {
Replied: BusEvent.define(
"permission.replied",
z.object({
- sessionID: z.string(),
- requestID: z.string(),
+ sessionID: SessionID.zod,
+ requestID: PermissionID.zod,
reply: Reply,
}),
),
@@ -142,7 +143,7 @@ export namespace PermissionNext {
if (rule.action === "deny")
throw new DeniedError(ruleset.filter((r) => Wildcard.match(request.permission, r.permission)))
if (rule.action === "ask") {
- const id = input.id ?? Identifier.ascending("permission")
+ const id = input.id ?? PermissionID.ascending()
return new Promise((resolve, reject) => {
const info: Request = {
id,
@@ -163,7 +164,7 @@ export namespace PermissionNext {
export const reply = fn(
z.object({
- requestID: Identifier.schema("permission"),
+ requestID: PermissionID.zod,
reply: Reply,
message: z.string().optional(),
}),
diff --git a/packages/opencode/src/permission/schema.ts b/packages/opencode/src/permission/schema.ts
new file mode 100644
index 000000000..c3242b714
--- /dev/null
+++ b/packages/opencode/src/permission/schema.ts
@@ -0,0 +1,17 @@
+import { Schema } from "effect"
+import z from "zod"
+
+import { Identifier } from "@/id/id"
+import { withStatics } from "@/util/schema"
+
+const permissionIdSchema = Schema.String.pipe(Schema.brand("PermissionID"))
+
+export type PermissionID = typeof permissionIdSchema.Type
+
+export const PermissionID = permissionIdSchema.pipe(
+ withStatics((schema: typeof permissionIdSchema) => ({
+ make: (id: string) => schema.makeUnsafe(id),
+ ascending: (id?: string) => schema.makeUnsafe(Identifier.ascending("permission", id)),
+ zod: Identifier.schema("permission").pipe(z.custom()),
+ })),
+)
diff --git a/packages/opencode/src/project/schema.ts b/packages/opencode/src/project/schema.ts
index adaa9a831..e904ff5a8 100644
--- a/packages/opencode/src/project/schema.ts
+++ b/packages/opencode/src/project/schema.ts
@@ -3,7 +3,7 @@ import z from "zod"
import { withStatics } from "@/util/schema"
-const projectIdSchema = Schema.String.pipe(Schema.brand("ProjectId"))
+const projectIdSchema = Schema.String.pipe(Schema.brand("ProjectID"))
export type ProjectID = typeof projectIdSchema.Type
diff --git a/packages/opencode/src/pty/index.ts b/packages/opencode/src/pty/index.ts
index 1c27d5b84..077a9dca5 100644
--- a/packages/opencode/src/pty/index.ts
+++ b/packages/opencode/src/pty/index.ts
@@ -2,12 +2,12 @@ import { BusEvent } from "@/bus/bus-event"
import { Bus } from "@/bus"
import { type IPty } from "bun-pty"
import z from "zod"
-import { Identifier } from "../id/id"
import { Log } from "../util/log"
import { Instance } from "../project/instance"
import { lazy } from "@opencode-ai/util/lazy"
import { Shell } from "@/shell/shell"
import { Plugin } from "@/plugin"
+import { PtyID } from "./schema"
export namespace Pty {
const log = Log.create({ service: "pty" })
@@ -40,7 +40,7 @@ export namespace Pty {
export const Info = z
.object({
- id: Identifier.schema("pty"),
+ id: PtyID.zod,
title: z.string(),
command: z.string(),
args: z.array(z.string()),
@@ -77,8 +77,8 @@ export namespace Pty {
export const Event = {
Created: BusEvent.define("pty.created", z.object({ info: Info })),
Updated: BusEvent.define("pty.updated", z.object({ info: Info })),
- Exited: BusEvent.define("pty.exited", z.object({ id: Identifier.schema("pty"), exitCode: z.number() })),
- Deleted: BusEvent.define("pty.deleted", z.object({ id: Identifier.schema("pty") })),
+ Exited: BusEvent.define("pty.exited", z.object({ id: PtyID.zod, exitCode: z.number() })),
+ Deleted: BusEvent.define("pty.deleted", z.object({ id: PtyID.zod })),
}
interface ActiveSession {
@@ -118,7 +118,7 @@ export namespace Pty {
}
export async function create(input: CreateInput) {
- const id = Identifier.create("pty", false)
+ const id = PtyID.ascending()
const command = input.command || Shell.preferred()
const args = input.args || []
if (command.endsWith("sh")) {
@@ -234,7 +234,7 @@ export namespace Pty {
}
}
session.subscribers.clear()
- Bus.publish(Event.Deleted, { id })
+ Bus.publish(Event.Deleted, { id: session.info.id })
}
export function resize(id: string, cols: number, rows: number) {
diff --git a/packages/opencode/src/pty/schema.ts b/packages/opencode/src/pty/schema.ts
new file mode 100644
index 000000000..47b3196f0
--- /dev/null
+++ b/packages/opencode/src/pty/schema.ts
@@ -0,0 +1,17 @@
+import { Schema } from "effect"
+import z from "zod"
+
+import { Identifier } from "@/id/id"
+import { withStatics } from "@/util/schema"
+
+const ptyIdSchema = Schema.String.pipe(Schema.brand("PtyID"))
+
+export type PtyID = typeof ptyIdSchema.Type
+
+export const PtyID = ptyIdSchema.pipe(
+ withStatics((schema: typeof ptyIdSchema) => ({
+ make: (id: string) => schema.makeUnsafe(id),
+ ascending: (id?: string) => schema.makeUnsafe(Identifier.ascending("pty", id)),
+ zod: Identifier.schema("pty").pipe(z.custom()),
+ })),
+)
diff --git a/packages/opencode/src/question/index.ts b/packages/opencode/src/question/index.ts
index c93b74b9a..0e145a040 100644
--- a/packages/opencode/src/question/index.ts
+++ b/packages/opencode/src/question/index.ts
@@ -1,9 +1,10 @@
import { Bus } from "@/bus"
import { BusEvent } from "@/bus/bus-event"
-import { Identifier } from "@/id/id"
+import { SessionID, MessageID } from "@/session/schema"
import { Instance } from "@/project/instance"
import { Log } from "@/util/log"
import z from "zod"
+import { QuestionID } from "./schema"
export namespace Question {
const log = Log.create({ service: "question" })
@@ -33,12 +34,12 @@ export namespace Question {
export const Request = z
.object({
- id: Identifier.schema("question"),
- sessionID: Identifier.schema("session"),
+ id: QuestionID.zod,
+ sessionID: SessionID.zod,
questions: z.array(Info).describe("Questions to ask"),
tool: z
.object({
- messageID: z.string(),
+ messageID: MessageID.zod,
callID: z.string(),
})
.optional(),
@@ -65,16 +66,16 @@ export namespace Question {
Replied: BusEvent.define(
"question.replied",
z.object({
- sessionID: z.string(),
- requestID: z.string(),
+ sessionID: SessionID.zod,
+ requestID: QuestionID.zod,
answers: z.array(Answer),
}),
),
Rejected: BusEvent.define(
"question.rejected",
z.object({
- sessionID: z.string(),
- requestID: z.string(),
+ sessionID: SessionID.zod,
+ requestID: QuestionID.zod,
}),
),
}
@@ -95,12 +96,12 @@ export namespace Question {
})
export async function ask(input: {
- sessionID: string
+ sessionID: SessionID
questions: Info[]
- tool?: { messageID: string; callID: string }
+ tool?: { messageID: MessageID; callID: string }
}): Promise {
const s = await state()
- const id = Identifier.ascending("question")
+ const id = QuestionID.ascending()
log.info("asking", { id, questions: input.questions.length })
diff --git a/packages/opencode/src/question/schema.ts b/packages/opencode/src/question/schema.ts
new file mode 100644
index 000000000..65e9ad07c
--- /dev/null
+++ b/packages/opencode/src/question/schema.ts
@@ -0,0 +1,17 @@
+import { Schema } from "effect"
+import z from "zod"
+
+import { Identifier } from "@/id/id"
+import { withStatics } from "@/util/schema"
+
+const questionIdSchema = Schema.String.pipe(Schema.brand("QuestionID"))
+
+export type QuestionID = typeof questionIdSchema.Type
+
+export const QuestionID = questionIdSchema.pipe(
+ withStatics((schema: typeof questionIdSchema) => ({
+ make: (id: string) => schema.makeUnsafe(id),
+ ascending: (id?: string) => schema.makeUnsafe(Identifier.ascending("question", id)),
+ zod: Identifier.schema("question").pipe(z.custom()),
+ })),
+)
diff --git a/packages/opencode/src/server/routes/permission.ts b/packages/opencode/src/server/routes/permission.ts
index 8fc2d594d..6d86703c6 100644
--- a/packages/opencode/src/server/routes/permission.ts
+++ b/packages/opencode/src/server/routes/permission.ts
@@ -2,6 +2,7 @@ import { Hono } from "hono"
import { describeRoute, validator, resolver } from "hono-openapi"
import z from "zod"
import { PermissionNext } from "@/permission/next"
+import { PermissionID } from "@/permission/schema"
import { errors } from "../error"
import { lazy } from "../../util/lazy"
@@ -28,7 +29,7 @@ export const PermissionRoutes = lazy(() =>
validator(
"param",
z.object({
- requestID: z.string(),
+ requestID: PermissionID.zod,
}),
),
validator("json", z.object({ reply: PermissionNext.Reply, message: z.string().optional() })),
diff --git a/packages/opencode/src/server/routes/pty.ts b/packages/opencode/src/server/routes/pty.ts
index 368c9612b..0f9151ba4 100644
--- a/packages/opencode/src/server/routes/pty.ts
+++ b/packages/opencode/src/server/routes/pty.ts
@@ -3,6 +3,7 @@ import { describeRoute, validator, resolver } from "hono-openapi"
import { upgradeWebSocket } from "hono/bun"
import z from "zod"
import { Pty } from "@/pty"
+import { PtyID } from "@/pty/schema"
import { NotFoundError } from "../../storage/db"
import { errors } from "../error"
import { lazy } from "../../util/lazy"
@@ -72,7 +73,7 @@ export const PtyRoutes = lazy(() =>
...errors(404),
},
}),
- validator("param", z.object({ ptyID: z.string() })),
+ validator("param", z.object({ ptyID: PtyID.zod })),
async (c) => {
const info = Pty.get(c.req.valid("param").ptyID)
if (!info) {
@@ -99,7 +100,7 @@ export const PtyRoutes = lazy(() =>
...errors(400),
},
}),
- validator("param", z.object({ ptyID: z.string() })),
+ validator("param", z.object({ ptyID: PtyID.zod })),
validator("json", Pty.UpdateInput),
async (c) => {
const info = await Pty.update(c.req.valid("param").ptyID, c.req.valid("json"))
@@ -124,7 +125,7 @@ export const PtyRoutes = lazy(() =>
...errors(404),
},
}),
- validator("param", z.object({ ptyID: z.string() })),
+ validator("param", z.object({ ptyID: PtyID.zod })),
async (c) => {
await Pty.remove(c.req.valid("param").ptyID)
return c.json(true)
@@ -148,9 +149,9 @@ export const PtyRoutes = lazy(() =>
...errors(404),
},
}),
- validator("param", z.object({ ptyID: z.string() })),
+ validator("param", z.object({ ptyID: PtyID.zod })),
upgradeWebSocket((c) => {
- const id = c.req.param("ptyID")
+ const id = PtyID.zod.parse(c.req.param("ptyID"))
const cursor = (() => {
const value = c.req.query("cursor")
if (!value) return
diff --git a/packages/opencode/src/server/routes/question.ts b/packages/opencode/src/server/routes/question.ts
index eab675e81..3fff895fa 100644
--- a/packages/opencode/src/server/routes/question.ts
+++ b/packages/opencode/src/server/routes/question.ts
@@ -1,6 +1,7 @@
import { Hono } from "hono"
import { describeRoute, validator } from "hono-openapi"
import { resolver } from "hono-openapi"
+import { QuestionID } from "@/question/schema"
import { Question } from "../../question"
import z from "zod"
import { errors } from "../error"
@@ -51,7 +52,7 @@ export const QuestionRoutes = lazy(() =>
validator(
"param",
z.object({
- requestID: z.string(),
+ requestID: QuestionID.zod,
}),
),
validator("json", Question.Reply),
@@ -86,7 +87,7 @@ export const QuestionRoutes = lazy(() =>
validator(
"param",
z.object({
- requestID: z.string(),
+ requestID: QuestionID.zod,
}),
),
async (c) => {
diff --git a/packages/opencode/src/server/routes/session.ts b/packages/opencode/src/server/routes/session.ts
index 12938aeab..1c7cba28d 100644
--- a/packages/opencode/src/server/routes/session.ts
+++ b/packages/opencode/src/server/routes/session.ts
@@ -1,6 +1,7 @@
import { Hono } from "hono"
import { stream } from "hono/streaming"
import { describeRoute, validator, resolver } from "hono-openapi"
+import { SessionID, MessageID, PartID } from "@/session/schema"
import z from "zod"
import { Session } from "../../session"
import { MessageV2 } from "../../session/message-v2"
@@ -14,6 +15,7 @@ import { Agent } from "../../agent/agent"
import { Snapshot } from "@/snapshot"
import { Log } from "../../util/log"
import { PermissionNext } from "@/permission/next"
+import { PermissionID } from "@/permission/schema"
import { errors } from "../error"
import { lazy } from "../../util/lazy"
@@ -173,7 +175,7 @@ export const SessionRoutes = lazy(() =>
validator(
"param",
z.object({
- sessionID: z.string().meta({ description: "Session ID" }),
+ sessionID: SessionID.zod,
}),
),
async (c) => {
@@ -258,7 +260,7 @@ export const SessionRoutes = lazy(() =>
validator(
"param",
z.object({
- sessionID: z.string(),
+ sessionID: SessionID.zod,
}),
),
validator(
@@ -309,7 +311,7 @@ export const SessionRoutes = lazy(() =>
validator(
"param",
z.object({
- sessionID: z.string().meta({ description: "Session ID" }),
+ sessionID: SessionID.zod,
}),
),
validator("json", Session.initialize.schema.omit({ sessionID: true })),
@@ -372,7 +374,7 @@ export const SessionRoutes = lazy(() =>
validator(
"param",
z.object({
- sessionID: z.string(),
+ sessionID: SessionID.zod,
}),
),
async (c) => {
@@ -401,7 +403,7 @@ export const SessionRoutes = lazy(() =>
validator(
"param",
z.object({
- sessionID: z.string(),
+ sessionID: SessionID.zod,
}),
),
async (c) => {
@@ -502,7 +504,7 @@ export const SessionRoutes = lazy(() =>
validator(
"param",
z.object({
- sessionID: z.string().meta({ description: "Session ID" }),
+ sessionID: SessionID.zod,
}),
),
validator(
@@ -561,7 +563,7 @@ export const SessionRoutes = lazy(() =>
validator(
"param",
z.object({
- sessionID: z.string().meta({ description: "Session ID" }),
+ sessionID: SessionID.zod,
}),
),
validator(
@@ -605,8 +607,8 @@ export const SessionRoutes = lazy(() =>
validator(
"param",
z.object({
- sessionID: z.string().meta({ description: "Session ID" }),
- messageID: z.string().meta({ description: "Message ID" }),
+ sessionID: SessionID.zod,
+ messageID: MessageID.zod,
}),
),
async (c) => {
@@ -640,8 +642,8 @@ export const SessionRoutes = lazy(() =>
validator(
"param",
z.object({
- sessionID: z.string().meta({ description: "Session ID" }),
- messageID: z.string().meta({ description: "Message ID" }),
+ sessionID: SessionID.zod,
+ messageID: MessageID.zod,
}),
),
async (c) => {
@@ -674,9 +676,9 @@ export const SessionRoutes = lazy(() =>
validator(
"param",
z.object({
- sessionID: z.string().meta({ description: "Session ID" }),
- messageID: z.string().meta({ description: "Message ID" }),
- partID: z.string().meta({ description: "Part ID" }),
+ sessionID: SessionID.zod,
+ messageID: MessageID.zod,
+ partID: PartID.zod,
}),
),
async (c) => {
@@ -709,9 +711,9 @@ export const SessionRoutes = lazy(() =>
validator(
"param",
z.object({
- sessionID: z.string().meta({ description: "Session ID" }),
- messageID: z.string().meta({ description: "Message ID" }),
- partID: z.string().meta({ description: "Part ID" }),
+ sessionID: SessionID.zod,
+ messageID: MessageID.zod,
+ partID: PartID.zod,
}),
),
validator("json", MessageV2.Part),
@@ -753,7 +755,7 @@ export const SessionRoutes = lazy(() =>
validator(
"param",
z.object({
- sessionID: z.string().meta({ description: "Session ID" }),
+ sessionID: SessionID.zod,
}),
),
validator("json", SessionPrompt.PromptInput.omit({ sessionID: true })),
@@ -785,7 +787,7 @@ export const SessionRoutes = lazy(() =>
validator(
"param",
z.object({
- sessionID: z.string().meta({ description: "Session ID" }),
+ sessionID: SessionID.zod,
}),
),
validator("json", SessionPrompt.PromptInput.omit({ sessionID: true })),
@@ -825,7 +827,7 @@ export const SessionRoutes = lazy(() =>
validator(
"param",
z.object({
- sessionID: z.string().meta({ description: "Session ID" }),
+ sessionID: SessionID.zod,
}),
),
validator("json", SessionPrompt.CommandInput.omit({ sessionID: true })),
@@ -857,7 +859,7 @@ export const SessionRoutes = lazy(() =>
validator(
"param",
z.object({
- sessionID: z.string().meta({ description: "Session ID" }),
+ sessionID: SessionID.zod,
}),
),
validator("json", SessionPrompt.ShellInput.omit({ sessionID: true })),
@@ -889,7 +891,7 @@ export const SessionRoutes = lazy(() =>
validator(
"param",
z.object({
- sessionID: z.string(),
+ sessionID: SessionID.zod,
}),
),
validator("json", SessionRevert.RevertInput.omit({ sessionID: true })),
@@ -924,7 +926,7 @@ export const SessionRoutes = lazy(() =>
validator(
"param",
z.object({
- sessionID: z.string(),
+ sessionID: SessionID.zod,
}),
),
async (c) => {
@@ -955,8 +957,8 @@ export const SessionRoutes = lazy(() =>
validator(
"param",
z.object({
- sessionID: z.string(),
- permissionID: z.string(),
+ sessionID: SessionID.zod,
+ permissionID: PermissionID.zod,
}),
),
validator("json", z.object({ response: PermissionNext.Reply })),
diff --git a/packages/opencode/src/server/server.ts b/packages/opencode/src/server/server.ts
index 0566547b7..14c2346a6 100644
--- a/packages/opencode/src/server/server.ts
+++ b/packages/opencode/src/server/server.ts
@@ -22,6 +22,7 @@ import { Flag } from "../flag/flag"
import { Command } from "../command"
import { Global } from "../global"
import { WorkspaceContext } from "../control-plane/workspace-context"
+import { WorkspaceID } from "../control-plane/schema"
import { WorkspaceRouterMiddleware } from "../control-plane/workspace-router-middleware"
import { ProjectRoutes } from "./routes/project"
import { SessionRoutes } from "./routes/session"
@@ -190,7 +191,7 @@ export namespace Server {
)
.use(async (c, next) => {
if (c.req.path === "/log") return next()
- const workspaceID = c.req.query("workspace") || c.req.header("x-opencode-workspace")
+ const rawWorkspaceID = c.req.query("workspace") || c.req.header("x-opencode-workspace")
const raw = c.req.query("directory") || c.req.header("x-opencode-directory") || process.cwd()
const directory = Filesystem.resolve(
(() => {
@@ -203,7 +204,7 @@ export namespace Server {
)
return WorkspaceContext.provide({
- workspaceID,
+ workspaceID: rawWorkspaceID ? WorkspaceID.make(rawWorkspaceID) : undefined,
async fn() {
return Instance.provide({
directory,
diff --git a/packages/opencode/src/session/compaction.ts b/packages/opencode/src/session/compaction.ts
index 79884d641..1946eeee9 100644
--- a/packages/opencode/src/session/compaction.ts
+++ b/packages/opencode/src/session/compaction.ts
@@ -1,7 +1,7 @@
import { BusEvent } from "@/bus/bus-event"
import { Bus } from "@/bus"
import { Session } from "."
-import { Identifier } from "../id/id"
+import { SessionID, MessageID, PartID } from "./schema"
import { Instance } from "../project/instance"
import { Provider } from "../provider/provider"
import { MessageV2 } from "./message-v2"
@@ -22,7 +22,7 @@ export namespace SessionCompaction {
Compacted: BusEvent.define(
"session.compacted",
z.object({
- sessionID: z.string(),
+ sessionID: SessionID.zod,
}),
),
}
@@ -55,7 +55,7 @@ export namespace SessionCompaction {
// goes backwards through parts until there are 40_000 tokens worth of tool
// calls. then erases output of previous tool calls. idea is to throw away old
// tool calls that are no longer relevant.
- export async function prune(input: { sessionID: string }) {
+ export async function prune(input: { sessionID: SessionID }) {
const config = await Config.get()
if (config.compaction?.prune === false) return
log.info("pruning")
@@ -99,9 +99,9 @@ export namespace SessionCompaction {
}
export async function process(input: {
- parentID: string
+ parentID: MessageID
messages: MessageV2.WithParts[]
- sessionID: string
+ sessionID: SessionID
abort: AbortSignal
auto: boolean
overflow?: boolean
@@ -133,7 +133,7 @@ export namespace SessionCompaction {
? await Provider.getModel(agent.model.providerID, agent.model.modelID)
: await Provider.getModel(userMessage.model.providerID, userMessage.model.modelID)
const msg = (await Session.updateMessage({
- id: Identifier.ascending("message"),
+ id: MessageID.ascending(),
role: "assistant",
parentID: input.parentID,
sessionID: input.sessionID,
@@ -236,7 +236,7 @@ When constructing the summary, try to stick to this template:
if (replay) {
const original = replay.info as MessageV2.User
const replayMsg = await Session.updateMessage({
- id: Identifier.ascending("message"),
+ id: MessageID.ascending(),
role: "user",
sessionID: input.sessionID,
time: { created: Date.now() },
@@ -255,14 +255,14 @@ When constructing the summary, try to stick to this template:
: part
await Session.updatePart({
...replayPart,
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: replayMsg.id,
sessionID: input.sessionID,
})
}
} else {
const continueMsg = await Session.updateMessage({
- id: Identifier.ascending("message"),
+ id: MessageID.ascending(),
role: "user",
sessionID: input.sessionID,
time: { created: Date.now() },
@@ -275,7 +275,7 @@ When constructing the summary, try to stick to this template:
: "") +
"Continue if you have next steps, or stop and ask for clarification if you are unsure how to proceed."
await Session.updatePart({
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: continueMsg.id,
sessionID: input.sessionID,
type: "text",
@@ -295,7 +295,7 @@ When constructing the summary, try to stick to this template:
export const create = fn(
z.object({
- sessionID: Identifier.schema("session"),
+ sessionID: SessionID.zod,
agent: z.string(),
model: z.object({
providerID: z.string(),
@@ -306,7 +306,7 @@ When constructing the summary, try to stick to this template:
}),
async (input) => {
const msg = await Session.updateMessage({
- id: Identifier.ascending("message"),
+ id: MessageID.ascending(),
role: "user",
model: input.model,
sessionID: input.sessionID,
@@ -316,7 +316,7 @@ When constructing the summary, try to stick to this template:
},
})
await Session.updatePart({
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: msg.id,
sessionID: msg.sessionID,
type: "compaction",
diff --git a/packages/opencode/src/session/index.ts b/packages/opencode/src/session/index.ts
index ff499fe2e..275b50e42 100644
--- a/packages/opencode/src/session/index.ts
+++ b/packages/opencode/src/session/index.ts
@@ -7,7 +7,6 @@ import z from "zod"
import { type ProviderMetadata } from "ai"
import { Config } from "../config/config"
import { Flag } from "../flag/flag"
-import { Identifier } from "../id/id"
import { Installation } from "../installation"
import { Database, NotFoundError, eq, and, or, gte, isNull, desc, like, inArray, lt } from "../storage/db"
@@ -24,6 +23,8 @@ import { Command } from "../command"
import { Snapshot } from "@/snapshot"
import { WorkspaceContext } from "../control-plane/workspace-context"
import { ProjectID } from "../project/schema"
+import { WorkspaceID } from "../control-plane/schema"
+import { SessionID, MessageID, PartID } from "./schema"
import type { Provider } from "@/provider/provider"
import { PermissionNext } from "@/permission/next"
@@ -119,12 +120,12 @@ export namespace Session {
export const Info = z
.object({
- id: Identifier.schema("session"),
+ id: SessionID.zod,
slug: z.string(),
projectID: ProjectID.zod,
- workspaceID: z.string().optional(),
+ workspaceID: WorkspaceID.zod.optional(),
directory: z.string(),
- parentID: Identifier.schema("session").optional(),
+ parentID: SessionID.zod.optional(),
summary: z
.object({
additions: z.number(),
@@ -149,8 +150,8 @@ export namespace Session {
permission: PermissionNext.Ruleset.optional(),
revert: z
.object({
- messageID: z.string(),
- partID: z.string().optional(),
+ messageID: MessageID.zod,
+ partID: PartID.zod.optional(),
snapshot: z.string().optional(),
diff: z.string().optional(),
})
@@ -201,14 +202,14 @@ export namespace Session {
Diff: BusEvent.define(
"session.diff",
z.object({
- sessionID: z.string(),
+ sessionID: SessionID.zod,
diff: Snapshot.FileDiff.array(),
}),
),
Error: BusEvent.define(
"session.error",
z.object({
- sessionID: z.string().optional(),
+ sessionID: SessionID.zod.optional(),
error: MessageV2.Assistant.shape.error,
}),
),
@@ -217,10 +218,10 @@ export namespace Session {
export const create = fn(
z
.object({
- parentID: Identifier.schema("session").optional(),
+ parentID: SessionID.zod.optional(),
title: z.string().optional(),
permission: Info.shape.permission,
- workspaceID: Identifier.schema("workspace").optional(),
+ workspaceID: WorkspaceID.zod.optional(),
})
.optional(),
async (input) => {
@@ -236,8 +237,8 @@ export namespace Session {
export const fork = fn(
z.object({
- sessionID: Identifier.schema("session"),
- messageID: Identifier.schema("message").optional(),
+ sessionID: SessionID.zod,
+ messageID: MessageID.zod.optional(),
}),
async (input) => {
const original = await get(input.sessionID)
@@ -249,11 +250,11 @@ export namespace Session {
title,
})
const msgs = await messages({ sessionID: input.sessionID })
- const idMap = new Map()
+ const idMap = new Map()
for (const msg of msgs) {
if (input.messageID && msg.info.id >= input.messageID) break
- const newID = Identifier.ascending("message")
+ const newID = MessageID.ascending()
idMap.set(msg.info.id, newID)
const parentID = msg.info.role === "assistant" && msg.info.parentID ? idMap.get(msg.info.parentID) : undefined
@@ -267,7 +268,7 @@ export namespace Session {
for (const part of msg.parts) {
await updatePart({
...part,
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: cloned.id,
sessionID: session.id,
})
@@ -277,7 +278,7 @@ export namespace Session {
},
)
- export const touch = fn(Identifier.schema("session"), async (sessionID) => {
+ export const touch = fn(SessionID.zod, async (sessionID) => {
const now = Date.now()
Database.use((db) => {
const row = db
@@ -293,15 +294,15 @@ export namespace Session {
})
export async function createNext(input: {
- id?: string
+ id?: SessionID
title?: string
- parentID?: string
- workspaceID?: string
+ parentID?: SessionID
+ workspaceID?: WorkspaceID
directory: string
permission?: PermissionNext.Ruleset
}) {
const result: Info = {
- id: Identifier.descending("session", input.id),
+ id: SessionID.descending(input.id),
slug: Slug.create(),
version: Installation.VERSION,
projectID: Instance.project.id,
@@ -342,13 +343,13 @@ export namespace Session {
return path.join(base, [input.time.created, input.slug].join("-") + ".md")
}
- export const get = fn(Identifier.schema("session"), async (id) => {
+ export const get = fn(SessionID.zod, async (id) => {
const row = Database.use((db) => db.select().from(SessionTable).where(eq(SessionTable.id, id)).get())
if (!row) throw new NotFoundError({ message: `Session not found: ${id}` })
return fromRow(row)
})
- export const share = fn(Identifier.schema("session"), async (id) => {
+ export const share = fn(SessionID.zod, async (id) => {
const cfg = await Config.get()
if (cfg.share === "disabled") {
throw new Error("Sharing is disabled in configuration")
@@ -364,7 +365,7 @@ export namespace Session {
return share
})
- export const unshare = fn(Identifier.schema("session"), async (id) => {
+ export const unshare = fn(SessionID.zod, async (id) => {
// Use ShareNext to remove the share (same as share function uses ShareNext to create)
const { ShareNext } = await import("@/share/share-next")
await ShareNext.remove(id)
@@ -378,7 +379,7 @@ export namespace Session {
export const setTitle = fn(
z.object({
- sessionID: Identifier.schema("session"),
+ sessionID: SessionID.zod,
title: z.string(),
}),
async (input) => {
@@ -399,7 +400,7 @@ export namespace Session {
export const setArchived = fn(
z.object({
- sessionID: Identifier.schema("session"),
+ sessionID: SessionID.zod,
time: z.number().optional(),
}),
async (input) => {
@@ -420,7 +421,7 @@ export namespace Session {
export const setPermission = fn(
z.object({
- sessionID: Identifier.schema("session"),
+ sessionID: SessionID.zod,
permission: PermissionNext.Ruleset,
}),
async (input) => {
@@ -441,7 +442,7 @@ export namespace Session {
export const setRevert = fn(
z.object({
- sessionID: Identifier.schema("session"),
+ sessionID: SessionID.zod,
revert: Info.shape.revert,
summary: Info.shape.summary,
}),
@@ -467,7 +468,7 @@ export namespace Session {
},
)
- export const clearRevert = fn(Identifier.schema("session"), async (sessionID) => {
+ export const clearRevert = fn(SessionID.zod, async (sessionID) => {
return Database.use((db) => {
const row = db
.update(SessionTable)
@@ -487,7 +488,7 @@ export namespace Session {
export const setSummary = fn(
z.object({
- sessionID: Identifier.schema("session"),
+ sessionID: SessionID.zod,
summary: Info.shape.summary,
}),
async (input) => {
@@ -511,7 +512,7 @@ export namespace Session {
},
)
- export const diff = fn(Identifier.schema("session"), async (sessionID) => {
+ export const diff = fn(SessionID.zod, async (sessionID) => {
try {
return await Storage.read(["session_diff", sessionID])
} catch {
@@ -521,7 +522,7 @@ export namespace Session {
export const messages = fn(
z.object({
- sessionID: Identifier.schema("session"),
+ sessionID: SessionID.zod,
limit: z.number().optional(),
}),
async (input) => {
@@ -537,7 +538,7 @@ export namespace Session {
export function* list(input?: {
directory?: string
- workspaceID?: string
+ workspaceID?: WorkspaceID
roots?: boolean
start?: number
search?: string
@@ -647,7 +648,7 @@ export namespace Session {
}
}
- export const children = fn(Identifier.schema("session"), async (parentID) => {
+ export const children = fn(SessionID.zod, async (parentID) => {
const project = Instance.project
const rows = Database.use((db) =>
db
@@ -659,7 +660,7 @@ export namespace Session {
return rows.map(fromRow)
})
- export const remove = fn(Identifier.schema("session"), async (sessionID) => {
+ export const remove = fn(SessionID.zod, async (sessionID) => {
const project = Instance.project
try {
const session = await get(sessionID)
@@ -705,8 +706,8 @@ export namespace Session {
export const removeMessage = fn(
z.object({
- sessionID: Identifier.schema("session"),
- messageID: Identifier.schema("message"),
+ sessionID: SessionID.zod,
+ messageID: MessageID.zod,
}),
async (input) => {
// CASCADE delete handles parts automatically
@@ -727,9 +728,9 @@ export namespace Session {
export const removePart = fn(
z.object({
- sessionID: Identifier.schema("session"),
- messageID: Identifier.schema("message"),
- partID: Identifier.schema("part"),
+ sessionID: SessionID.zod,
+ messageID: MessageID.zod,
+ partID: PartID.zod,
}),
async (input) => {
Database.use((db) => {
@@ -775,9 +776,9 @@ export namespace Session {
export const updatePartDelta = fn(
z.object({
- sessionID: z.string(),
- messageID: z.string(),
- partID: z.string(),
+ sessionID: SessionID.zod,
+ messageID: MessageID.zod,
+ partID: PartID.zod,
field: z.string(),
delta: z.string(),
}),
@@ -873,10 +874,10 @@ export namespace Session {
export const initialize = fn(
z.object({
- sessionID: Identifier.schema("session"),
+ sessionID: SessionID.zod,
modelID: z.string(),
providerID: z.string(),
- messageID: Identifier.schema("message"),
+ messageID: MessageID.zod,
}),
async (input) => {
await SessionPrompt.command({
diff --git a/packages/opencode/src/session/message-v2.ts b/packages/opencode/src/session/message-v2.ts
index 5b4e7bdbc..90abf5452 100644
--- a/packages/opencode/src/session/message-v2.ts
+++ b/packages/opencode/src/session/message-v2.ts
@@ -1,8 +1,8 @@
import { BusEvent } from "@/bus/bus-event"
+import { SessionID, MessageID, PartID } from "./schema"
import z from "zod"
import { NamedError } from "@opencode-ai/util/error"
import { APICallError, convertToModelMessages, LoadAPIKeyError, type ModelMessage, type UIMessage } from "ai"
-import { Identifier } from "../id/id"
import { LSP } from "../lsp"
import { Snapshot } from "@/snapshot"
import { fn } from "@/util/fn"
@@ -78,9 +78,9 @@ export namespace MessageV2 {
export type OutputFormat = z.infer
const PartBase = z.object({
- id: z.string(),
- sessionID: z.string(),
- messageID: z.string(),
+ id: PartID.zod,
+ sessionID: SessionID.zod,
+ messageID: MessageID.zod,
})
export const SnapshotPart = PartBase.extend({
@@ -343,8 +343,8 @@ export namespace MessageV2 {
export type ToolPart = z.infer
const Base = z.object({
- id: z.string(),
- sessionID: z.string(),
+ id: MessageID.zod,
+ sessionID: SessionID.zod,
})
export const User = Base.extend({
@@ -410,7 +410,7 @@ export namespace MessageV2 {
APIError.Schema,
])
.optional(),
- parentID: z.string(),
+ parentID: MessageID.zod,
modelID: z.string(),
providerID: z.string(),
/**
@@ -457,8 +457,8 @@ export namespace MessageV2 {
Removed: BusEvent.define(
"message.removed",
z.object({
- sessionID: z.string(),
- messageID: z.string(),
+ sessionID: SessionID.zod,
+ messageID: MessageID.zod,
}),
),
PartUpdated: BusEvent.define(
@@ -470,9 +470,9 @@ export namespace MessageV2 {
PartDelta: BusEvent.define(
"message.part.delta",
z.object({
- sessionID: z.string(),
- messageID: z.string(),
- partID: z.string(),
+ sessionID: SessionID.zod,
+ messageID: MessageID.zod,
+ partID: PartID.zod,
field: z.string(),
delta: z.string(),
}),
@@ -480,9 +480,9 @@ export namespace MessageV2 {
PartRemoved: BusEvent.define(
"message.part.removed",
z.object({
- sessionID: z.string(),
- messageID: z.string(),
- partID: z.string(),
+ sessionID: SessionID.zod,
+ messageID: MessageID.zod,
+ partID: PartID.zod,
}),
),
}
@@ -698,7 +698,7 @@ export namespace MessageV2 {
// media (images, PDFs) in tool results
if (media.length > 0) {
result.push({
- id: Identifier.ascending("message"),
+ id: MessageID.ascending(),
role: "user",
parts: [
{
@@ -728,7 +728,7 @@ export namespace MessageV2 {
)
}
- export const stream = fn(Identifier.schema("session"), async function* (sessionID) {
+ export const stream = fn(SessionID.zod, async function* (sessionID) {
const size = 50
let offset = 0
while (true) {
@@ -781,7 +781,7 @@ export namespace MessageV2 {
}
})
- export const parts = fn(Identifier.schema("message"), async (message_id) => {
+ export const parts = fn(MessageID.zod, async (message_id) => {
const rows = Database.use((db) =>
db.select().from(PartTable).where(eq(PartTable.message_id, message_id)).orderBy(PartTable.id).all(),
)
@@ -792,8 +792,8 @@ export namespace MessageV2 {
export const get = fn(
z.object({
- sessionID: Identifier.schema("session"),
- messageID: Identifier.schema("message"),
+ sessionID: SessionID.zod,
+ messageID: MessageID.zod,
}),
async (input): Promise => {
const row = Database.use((db) => db.select().from(MessageTable).where(eq(MessageTable.id, input.messageID)).get())
diff --git a/packages/opencode/src/session/message.ts b/packages/opencode/src/session/message.ts
index 5c950d0e4..691057db2 100644
--- a/packages/opencode/src/session/message.ts
+++ b/packages/opencode/src/session/message.ts
@@ -1,4 +1,5 @@
import z from "zod"
+import { SessionID } from "./schema"
import { NamedError } from "@opencode-ai/util/error"
export namespace Message {
@@ -142,7 +143,7 @@ export namespace Message {
error: z
.discriminatedUnion("name", [AuthError.Schema, NamedError.Unknown.Schema, OutputLengthError.Schema])
.optional(),
- sessionID: z.string(),
+ sessionID: SessionID.zod,
tool: z.record(
z.string(),
z
diff --git a/packages/opencode/src/session/processor.ts b/packages/opencode/src/session/processor.ts
index 67edc0ecf..38dac41b0 100644
--- a/packages/opencode/src/session/processor.ts
+++ b/packages/opencode/src/session/processor.ts
@@ -1,6 +1,5 @@
import { MessageV2 } from "./message-v2"
import { Log } from "@/util/log"
-import { Identifier } from "@/id/id"
import { Session } from "."
import { Agent } from "@/agent/agent"
import { Snapshot } from "@/snapshot"
@@ -15,6 +14,8 @@ import { Config } from "@/config/config"
import { SessionCompaction } from "./compaction"
import { PermissionNext } from "@/permission/next"
import { Question } from "@/question"
+import { PartID } from "./schema"
+import type { SessionID, MessageID } from "./schema"
export namespace SessionProcessor {
const DOOM_LOOP_THRESHOLD = 3
@@ -25,7 +26,7 @@ export namespace SessionProcessor {
export function create(input: {
assistantMessage: MessageV2.Assistant
- sessionID: string
+ sessionID: SessionID
model: Provider.Model
abort: AbortSignal
}) {
@@ -64,7 +65,7 @@ export namespace SessionProcessor {
continue
}
const reasoningPart = {
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: input.assistantMessage.id,
sessionID: input.assistantMessage.sessionID,
type: "reasoning" as const,
@@ -110,7 +111,7 @@ export namespace SessionProcessor {
case "tool-input-start":
const part = await Session.updatePart({
- id: toolcalls[value.id]?.id ?? Identifier.ascending("part"),
+ id: toolcalls[value.id]?.id ?? PartID.ascending(),
messageID: input.assistantMessage.id,
sessionID: input.assistantMessage.sessionID,
type: "tool",
@@ -233,7 +234,7 @@ export namespace SessionProcessor {
case "start-step":
snapshot = await Snapshot.track()
await Session.updatePart({
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: input.assistantMessage.id,
sessionID: input.sessionID,
snapshot,
@@ -251,7 +252,7 @@ export namespace SessionProcessor {
input.assistantMessage.cost += usage.cost
input.assistantMessage.tokens = usage.tokens
await Session.updatePart({
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
reason: value.finishReason,
snapshot: await Snapshot.track(),
messageID: input.assistantMessage.id,
@@ -265,7 +266,7 @@ export namespace SessionProcessor {
const patch = await Snapshot.patch(snapshot)
if (patch.files.length) {
await Session.updatePart({
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: input.assistantMessage.id,
sessionID: input.sessionID,
type: "patch",
@@ -289,7 +290,7 @@ export namespace SessionProcessor {
case "text-start":
currentText = {
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: input.assistantMessage.id,
sessionID: input.assistantMessage.sessionID,
type: "text",
@@ -388,7 +389,7 @@ export namespace SessionProcessor {
const patch = await Snapshot.patch(snapshot)
if (patch.files.length) {
await Session.updatePart({
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: input.assistantMessage.id,
sessionID: input.sessionID,
type: "patch",
diff --git a/packages/opencode/src/session/prompt.ts b/packages/opencode/src/session/prompt.ts
index 54adf1104..b8be93b6b 100644
--- a/packages/opencode/src/session/prompt.ts
+++ b/packages/opencode/src/session/prompt.ts
@@ -3,7 +3,7 @@ import os from "os"
import fs from "fs/promises"
import z from "zod"
import { Filesystem } from "../util/filesystem"
-import { Identifier } from "../id/id"
+import { SessionID, MessageID, PartID } from "./schema"
import { MessageV2 } from "./message-v2"
import { Log } from "../util/log"
import { SessionRevert } from "./revert"
@@ -84,14 +84,14 @@ export namespace SessionPrompt {
},
)
- export function assertNotBusy(sessionID: string) {
+ export function assertNotBusy(sessionID: SessionID) {
const match = state()[sessionID]
if (match) throw new Session.BusyError(sessionID)
}
export const PromptInput = z.object({
- sessionID: Identifier.schema("session"),
- messageID: Identifier.schema("message").optional(),
+ sessionID: SessionID.zod,
+ messageID: MessageID.zod.optional(),
model: z
.object({
providerID: z.string(),
@@ -254,7 +254,7 @@ export namespace SessionPrompt {
return s[sessionID].abort.signal
}
- export function cancel(sessionID: string) {
+ export function cancel(sessionID: SessionID) {
log.info("cancel", { sessionID })
const s = state()
const match = s[sessionID]
@@ -269,7 +269,7 @@ export namespace SessionPrompt {
}
export const LoopInput = z.object({
- sessionID: Identifier.schema("session"),
+ sessionID: SessionID.zod,
resume_existing: z.boolean().optional(),
})
export const loop = fn(LoopInput, async (input) => {
@@ -354,7 +354,7 @@ export namespace SessionPrompt {
const taskTool = await TaskTool.init()
const taskModel = task.model ? await Provider.getModel(task.model.providerID, task.model.modelID) : model
const assistantMessage = (await Session.updateMessage({
- id: Identifier.ascending("message"),
+ id: MessageID.ascending(),
role: "assistant",
parentID: lastUser.id,
sessionID,
@@ -379,7 +379,7 @@ export namespace SessionPrompt {
},
})) as MessageV2.Assistant
let part = (await Session.updatePart({
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: assistantMessage.id,
sessionID: assistantMessage.sessionID,
type: "tool",
@@ -448,7 +448,7 @@ export namespace SessionPrompt {
})
const attachments = result?.attachments?.map((attachment) => ({
...attachment,
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
sessionID,
messageID: assistantMessage.id,
}))
@@ -503,7 +503,7 @@ export namespace SessionPrompt {
// If we create assistant messages w/ out user ones following mid loop thinking signatures
// will be missing and it can cause errors for models like gemini for example
const summaryUserMsg: MessageV2.User = {
- id: Identifier.ascending("message"),
+ id: MessageID.ascending(),
sessionID,
role: "user",
time: {
@@ -514,7 +514,7 @@ export namespace SessionPrompt {
}
await Session.updateMessage(summaryUserMsg)
await Session.updatePart({
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: summaryUserMsg.id,
sessionID,
type: "text",
@@ -567,7 +567,7 @@ export namespace SessionPrompt {
const processor = SessionProcessor.create({
assistantMessage: (await Session.updateMessage({
- id: Identifier.ascending("message"),
+ id: MessageID.ascending(),
parentID: lastUser.id,
role: "assistant",
mode: agent.name,
@@ -731,7 +731,7 @@ export namespace SessionPrompt {
throw new Error("Impossible")
})
- async function lastModel(sessionID: string) {
+ async function lastModel(sessionID: SessionID) {
for await (const item of MessageV2.stream(sessionID)) {
if (item.info.role === "user" && item.info.model) return item.info.model
}
@@ -813,7 +813,7 @@ export namespace SessionPrompt {
...result,
attachments: result.attachments?.map((attachment) => ({
...attachment,
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
sessionID: ctx.sessionID,
messageID: input.processor.message.id,
})),
@@ -916,7 +916,7 @@ export namespace SessionPrompt {
output: truncated.content,
attachments: attachments.map((attachment) => ({
...attachment,
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
sessionID: ctx.sessionID,
messageID: input.processor.message.id,
})),
@@ -970,7 +970,7 @@ export namespace SessionPrompt {
const variant = input.variant ?? (agent.variant && full?.variants?.[agent.variant] ? agent.variant : undefined)
const info: MessageV2.Info = {
- id: input.messageID ?? Identifier.ascending("message"),
+ id: input.messageID ?? MessageID.ascending(),
role: "user",
sessionID: input.sessionID,
time: {
@@ -988,7 +988,7 @@ export namespace SessionPrompt {
type Draft = T extends MessageV2.Part ? Omit & { id?: string } : never
const assign = (part: Draft): MessageV2.Part => ({
...part,
- id: part.id ?? Identifier.ascending("part"),
+ id: part.id ? PartID.make(part.id) : PartID.ascending(),
})
const parts = await Promise.all(
@@ -1334,7 +1334,7 @@ export namespace SessionPrompt {
if (!Flag.OPENCODE_EXPERIMENTAL_PLAN_MODE) {
if (input.agent.name === "plan") {
userMessage.parts.push({
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: userMessage.info.id,
sessionID: userMessage.info.sessionID,
type: "text",
@@ -1345,7 +1345,7 @@ export namespace SessionPrompt {
const wasPlan = input.messages.some((msg) => msg.info.role === "assistant" && msg.info.agent === "plan")
if (wasPlan && input.agent.name === "build") {
userMessage.parts.push({
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: userMessage.info.id,
sessionID: userMessage.info.sessionID,
type: "text",
@@ -1365,7 +1365,7 @@ export namespace SessionPrompt {
const exists = await Filesystem.exists(plan)
if (exists) {
const part = await Session.updatePart({
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: userMessage.info.id,
sessionID: userMessage.info.sessionID,
type: "text",
@@ -1384,7 +1384,7 @@ export namespace SessionPrompt {
const exists = await Filesystem.exists(plan)
if (!exists) await fs.mkdir(path.dirname(plan), { recursive: true })
const part = await Session.updatePart({
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: userMessage.info.id,
sessionID: userMessage.info.sessionID,
type: "text",
@@ -1467,7 +1467,7 @@ NOTE: At any point in time through this workflow you should feel free to ask the
}
export const ShellInput = z.object({
- sessionID: Identifier.schema("session"),
+ sessionID: SessionID.zod,
agent: z.string(),
model: z
.object({
@@ -1504,7 +1504,7 @@ NOTE: At any point in time through this workflow you should feel free to ask the
const agent = await Agent.get(input.agent)
const model = input.model ?? agent.model ?? (await lastModel(input.sessionID))
const userMsg: MessageV2.User = {
- id: Identifier.ascending("message"),
+ id: MessageID.ascending(),
sessionID: input.sessionID,
time: {
created: Date.now(),
@@ -1519,7 +1519,7 @@ NOTE: At any point in time through this workflow you should feel free to ask the
await Session.updateMessage(userMsg)
const userPart: MessageV2.Part = {
type: "text",
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: userMsg.id,
sessionID: input.sessionID,
text: "The following tool was executed by the user",
@@ -1528,7 +1528,7 @@ NOTE: At any point in time through this workflow you should feel free to ask the
await Session.updatePart(userPart)
const msg: MessageV2.Assistant = {
- id: Identifier.ascending("message"),
+ id: MessageID.ascending(),
sessionID: input.sessionID,
parentID: userMsg.id,
mode: input.agent,
@@ -1554,7 +1554,7 @@ NOTE: At any point in time through this workflow you should feel free to ask the
await Session.updateMessage(msg)
const part: MessageV2.Part = {
type: "tool",
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: msg.id,
sessionID: input.sessionID,
tool: "bash",
@@ -1718,8 +1718,8 @@ NOTE: At any point in time through this workflow you should feel free to ask the
}
export const CommandInput = z.object({
- messageID: Identifier.schema("message").optional(),
- sessionID: Identifier.schema("session"),
+ messageID: MessageID.zod.optional(),
+ sessionID: SessionID.zod,
agent: z.string().optional(),
model: z.string().optional(),
arguments: z.string(),
diff --git a/packages/opencode/src/session/revert.ts b/packages/opencode/src/session/revert.ts
index ef9c7e2aa..c5c9edbbd 100644
--- a/packages/opencode/src/session/revert.ts
+++ b/packages/opencode/src/session/revert.ts
@@ -1,5 +1,5 @@
import z from "zod"
-import { Identifier } from "../id/id"
+import { SessionID, MessageID, PartID } from "./schema"
import { Snapshot } from "../snapshot"
import { MessageV2 } from "./message-v2"
import { Session } from "."
@@ -15,9 +15,9 @@ export namespace SessionRevert {
const log = Log.create({ service: "session.revert" })
export const RevertInput = z.object({
- sessionID: Identifier.schema("session"),
- messageID: Identifier.schema("message"),
- partID: Identifier.schema("part").optional(),
+ sessionID: SessionID.zod,
+ messageID: MessageID.zod,
+ partID: PartID.zod.optional(),
})
export type RevertInput = z.infer
@@ -79,7 +79,7 @@ export namespace SessionRevert {
return session
}
- export async function unrevert(input: { sessionID: string }) {
+ export async function unrevert(input: { sessionID: SessionID }) {
log.info("unreverting", input)
SessionPrompt.assertNotBusy(input.sessionID)
const session = await Session.get(input.sessionID)
diff --git a/packages/opencode/src/session/schema.ts b/packages/opencode/src/session/schema.ts
new file mode 100644
index 000000000..b37fefae6
--- /dev/null
+++ b/packages/opencode/src/session/schema.ts
@@ -0,0 +1,41 @@
+import { Schema } from "effect"
+import z from "zod"
+
+import { withStatics } from "@/util/schema"
+import { Identifier } from "@/id/id"
+
+const sessionIdSchema = Schema.String.pipe(Schema.brand("SessionID"))
+
+export type SessionID = typeof sessionIdSchema.Type
+
+export const SessionID = sessionIdSchema.pipe(
+ withStatics((schema: typeof sessionIdSchema) => ({
+ make: (id: string) => schema.makeUnsafe(id),
+ descending: (id?: string) => schema.makeUnsafe(Identifier.descending("session", id)),
+ zod: Identifier.schema("session").pipe(z.custom()),
+ })),
+)
+
+const messageIdSchema = Schema.String.pipe(Schema.brand("MessageID"))
+
+export type MessageID = typeof messageIdSchema.Type
+
+export const MessageID = messageIdSchema.pipe(
+ withStatics((schema: typeof messageIdSchema) => ({
+ make: (id: string) => schema.makeUnsafe(id),
+ ascending: (id?: string) => schema.makeUnsafe(Identifier.ascending("message", id)),
+ zod: Identifier.schema("message").pipe(z.custom()),
+ })),
+)
+
+const partIdSchema = Schema.String.pipe(Schema.brand("PartID"))
+
+export type PartID = typeof partIdSchema.Type
+
+export const PartID = partIdSchema.pipe(
+ withStatics((schema: typeof partIdSchema) => ({
+ make: (id: string) => schema.makeUnsafe(id),
+ ascending: (id?: string) => schema.makeUnsafe(Identifier.ascending("part", id)),
+ zod: Identifier.schema("part").pipe(z.custom()),
+ })),
+)
diff --git a/packages/opencode/src/session/session.sql.ts b/packages/opencode/src/session/session.sql.ts
index 0b62dbbd8..71abc8516 100644
--- a/packages/opencode/src/session/session.sql.ts
+++ b/packages/opencode/src/session/session.sql.ts
@@ -4,6 +4,8 @@ import type { MessageV2 } from "./message-v2"
import type { Snapshot } from "../snapshot"
import type { PermissionNext } from "../permission/next"
import type { ProjectID } from "../project/schema"
+import type { SessionID, MessageID, PartID } from "./schema"
+import type { WorkspaceID } from "../control-plane/schema"
import { Timestamps } from "../storage/schema.sql"
type PartData = Omit
@@ -12,13 +14,13 @@ type InfoData = Omit
export const SessionTable = sqliteTable(
"session",
{
- id: text().primaryKey(),
+ id: text().$type().primaryKey(),
project_id: text()
.$type()
.notNull()
.references(() => ProjectTable.id, { onDelete: "cascade" }),
- workspace_id: text(),
- parent_id: text(),
+ workspace_id: text().$type(),
+ parent_id: text().$type(),
slug: text().notNull(),
directory: text().notNull(),
title: text().notNull(),
@@ -28,7 +30,7 @@ export const SessionTable = sqliteTable(
summary_deletions: integer(),
summary_files: integer(),
summary_diffs: text({ mode: "json" }).$type(),
- revert: text({ mode: "json" }).$type<{ messageID: string; partID?: string; snapshot?: string; diff?: string }>(),
+ revert: text({ mode: "json" }).$type<{ messageID: MessageID; partID?: PartID; snapshot?: string; diff?: string }>(),
permission: text({ mode: "json" }).$type(),
...Timestamps,
time_compacting: integer(),
@@ -44,8 +46,9 @@ export const SessionTable = sqliteTable(
export const MessageTable = sqliteTable(
"message",
{
- id: text().primaryKey(),
+ id: text().$type().primaryKey(),
session_id: text()
+ .$type()
.notNull()
.references(() => SessionTable.id, { onDelete: "cascade" }),
...Timestamps,
@@ -57,11 +60,12 @@ export const MessageTable = sqliteTable(
export const PartTable = sqliteTable(
"part",
{
- id: text().primaryKey(),
+ id: text().$type().primaryKey(),
message_id: text()
+ .$type()
.notNull()
.references(() => MessageTable.id, { onDelete: "cascade" }),
- session_id: text().notNull(),
+ session_id: text().$type().notNull(),
...Timestamps,
data: text({ mode: "json" }).notNull().$type(),
},
@@ -72,6 +76,7 @@ export const TodoTable = sqliteTable(
"todo",
{
session_id: text()
+ .$type()
.notNull()
.references(() => SessionTable.id, { onDelete: "cascade" }),
content: text().notNull(),
diff --git a/packages/opencode/src/session/status.ts b/packages/opencode/src/session/status.ts
index 1db03b5db..57e793985 100644
--- a/packages/opencode/src/session/status.ts
+++ b/packages/opencode/src/session/status.ts
@@ -1,6 +1,7 @@
import { BusEvent } from "@/bus/bus-event"
import { Bus } from "@/bus"
import { Instance } from "@/project/instance"
+import { SessionID } from "./schema"
import z from "zod"
export namespace SessionStatus {
@@ -28,7 +29,7 @@ export namespace SessionStatus {
Status: BusEvent.define(
"session.status",
z.object({
- sessionID: z.string(),
+ sessionID: SessionID.zod,
status: Info,
}),
),
@@ -36,7 +37,7 @@ export namespace SessionStatus {
Idle: BusEvent.define(
"session.idle",
z.object({
- sessionID: z.string(),
+ sessionID: SessionID.zod,
}),
),
}
@@ -46,7 +47,7 @@ export namespace SessionStatus {
return data
})
- export function get(sessionID: string) {
+ export function get(sessionID: SessionID) {
return (
state()[sessionID] ?? {
type: "idle",
@@ -58,7 +59,7 @@ export namespace SessionStatus {
return state()
}
- export function set(sessionID: string, status: Info) {
+ export function set(sessionID: SessionID, status: Info) {
Bus.publish(Event.Status, {
sessionID,
status,
diff --git a/packages/opencode/src/session/summary.ts b/packages/opencode/src/session/summary.ts
index 349336ba7..678a00851 100644
--- a/packages/opencode/src/session/summary.ts
+++ b/packages/opencode/src/session/summary.ts
@@ -4,6 +4,7 @@ import { Session } from "."
import { MessageV2 } from "./message-v2"
import { Identifier } from "@/id/id"
+import { SessionID, MessageID } from "./schema"
import { Snapshot } from "@/snapshot"
import { Storage } from "@/storage/storage"
@@ -68,8 +69,8 @@ export namespace SessionSummary {
export const summarize = fn(
z.object({
- sessionID: z.string(),
- messageID: z.string(),
+ sessionID: SessionID.zod,
+ messageID: MessageID.zod,
}),
async (input) => {
const all = await Session.messages({ sessionID: input.sessionID })
@@ -80,7 +81,7 @@ export namespace SessionSummary {
},
)
- async function summarizeSession(input: { sessionID: string; messages: MessageV2.WithParts[] }) {
+ async function summarizeSession(input: { sessionID: SessionID; messages: MessageV2.WithParts[] }) {
const diffs = await computeDiff({ messages: input.messages })
await Session.setSummary({
sessionID: input.sessionID,
@@ -113,8 +114,8 @@ export namespace SessionSummary {
export const diff = fn(
z.object({
- sessionID: Identifier.schema("session"),
- messageID: Identifier.schema("message").optional(),
+ sessionID: SessionID.zod,
+ messageID: MessageID.zod.optional(),
}),
async (input) => {
const diffs = await Storage.read(["session_diff", input.sessionID]).catch(() => [])
diff --git a/packages/opencode/src/session/todo.ts b/packages/opencode/src/session/todo.ts
index ec2bcdda3..02ad0d3b3 100644
--- a/packages/opencode/src/session/todo.ts
+++ b/packages/opencode/src/session/todo.ts
@@ -1,5 +1,6 @@
import { BusEvent } from "@/bus/bus-event"
import { Bus } from "@/bus"
+import { SessionID } from "./schema"
import z from "zod"
import { Database, eq, asc } from "../storage/db"
import { TodoTable } from "./session.sql"
@@ -18,13 +19,13 @@ export namespace Todo {
Updated: BusEvent.define(
"todo.updated",
z.object({
- sessionID: z.string(),
+ sessionID: SessionID.zod,
todos: z.array(Info),
}),
),
}
- export function update(input: { sessionID: string; todos: Info[] }) {
+ export function update(input: { sessionID: SessionID; todos: Info[] }) {
Database.transaction((db) => {
db.delete(TodoTable).where(eq(TodoTable.session_id, input.sessionID)).run()
if (input.todos.length === 0) return
@@ -43,7 +44,7 @@ export namespace Todo {
Bus.publish(Event.Updated, input)
}
- export function get(sessionID: string) {
+ export function get(sessionID: SessionID) {
const rows = Database.use((db) =>
db.select().from(TodoTable).where(eq(TodoTable.session_id, sessionID)).orderBy(asc(TodoTable.position)).all(),
)
diff --git a/packages/opencode/src/share/share-next.ts b/packages/opencode/src/share/share-next.ts
index 73fd21d90..d1b09e4bf 100644
--- a/packages/opencode/src/share/share-next.ts
+++ b/packages/opencode/src/share/share-next.ts
@@ -3,6 +3,7 @@ import { Account } from "@/account"
import { Config } from "@/config/config"
import { Provider } from "@/provider/provider"
import { Session } from "@/session"
+import type { SessionID } from "@/session/schema"
import { MessageV2 } from "@/session/message-v2"
import { Database, eq } from "@/storage/db"
import { SessionShareTable } from "./share.sql"
@@ -109,7 +110,7 @@ export namespace ShareNext {
})
}
- export async function create(sessionID: string) {
+ export async function create(sessionID: SessionID) {
if (disabled) return { id: "", url: "", secret: "" }
log.info("creating share", { sessionID })
const req = await request()
@@ -140,7 +141,7 @@ export namespace ShareNext {
return result
}
- function get(sessionID: string) {
+ function get(sessionID: SessionID) {
const row = Database.use((db) =>
db.select().from(SessionShareTable).where(eq(SessionShareTable.session_id, sessionID)).get(),
)
@@ -186,7 +187,7 @@ export namespace ShareNext {
}
const queue = new Map }>()
- async function sync(sessionID: string, data: Data[]) {
+ async function sync(sessionID: SessionID, data: Data[]) {
if (disabled) return
const existing = queue.get(sessionID)
if (existing) {
@@ -225,7 +226,7 @@ export namespace ShareNext {
queue.set(sessionID, { timeout, data: dataMap })
}
- export async function remove(sessionID: string) {
+ export async function remove(sessionID: SessionID) {
if (disabled) return
log.info("removing share", { sessionID })
const share = get(sessionID)
@@ -248,7 +249,7 @@ export namespace ShareNext {
Database.use((db) => db.delete(SessionShareTable).where(eq(SessionShareTable.session_id, sessionID)).run())
}
- async function fullSync(sessionID: string) {
+ async function fullSync(sessionID: SessionID) {
log.info("full sync", { sessionID })
const session = await Session.get(sessionID)
const diffs = await Session.diff(sessionID)
diff --git a/packages/opencode/src/tool/batch.ts b/packages/opencode/src/tool/batch.ts
index eecbfe299..0e864b021 100644
--- a/packages/opencode/src/tool/batch.ts
+++ b/packages/opencode/src/tool/batch.ts
@@ -31,7 +31,7 @@ export const BatchTool = Tool.define("batch", async () => {
},
async execute(params, ctx) {
const { Session } = await import("../session")
- const { Identifier } = await import("../id/id")
+ const { PartID } = await import("../session/schema")
const toolCalls = params.tool_calls.slice(0, 25)
const discardedCalls = params.tool_calls.slice(25)
@@ -42,7 +42,7 @@ export const BatchTool = Tool.define("batch", async () => {
const executeCall = async (call: (typeof toolCalls)[0]) => {
const callStartTime = Date.now()
- const partID = Identifier.ascending("part")
+ const partID = PartID.ascending()
try {
if (DISALLOWED.has(call.tool)) {
@@ -79,7 +79,7 @@ export const BatchTool = Tool.define("batch", async () => {
const result = await tool.execute(validatedParams, { ...ctx, callID: partID })
const attachments = result.attachments?.map((attachment) => ({
...attachment,
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
sessionID: ctx.sessionID,
messageID: ctx.messageID,
}))
@@ -134,7 +134,7 @@ export const BatchTool = Tool.define("batch", async () => {
// Add discarded calls as errors
const now = Date.now()
for (const call of discardedCalls) {
- const partID = Identifier.ascending("part")
+ const partID = PartID.ascending()
await Session.updatePart({
id: partID,
messageID: ctx.messageID,
diff --git a/packages/opencode/src/tool/plan.ts b/packages/opencode/src/tool/plan.ts
index ff84dccec..e91bc3faa 100644
--- a/packages/opencode/src/tool/plan.ts
+++ b/packages/opencode/src/tool/plan.ts
@@ -4,12 +4,12 @@ import { Tool } from "./tool"
import { Question } from "../question"
import { Session } from "../session"
import { MessageV2 } from "../session/message-v2"
-import { Identifier } from "../id/id"
import { Provider } from "../provider/provider"
import { Instance } from "../project/instance"
+import { type SessionID, MessageID, PartID } from "../session/schema"
import EXIT_DESCRIPTION from "./plan-exit.txt"
-async function getLastModel(sessionID: string) {
+async function getLastModel(sessionID: SessionID) {
for await (const item of MessageV2.stream(sessionID)) {
if (item.info.role === "user" && item.info.model) return item.info.model
}
@@ -44,7 +44,7 @@ export const PlanExitTool = Tool.define("plan_exit", {
const model = await getLastModel(ctx.sessionID)
const userMsg: MessageV2.User = {
- id: Identifier.ascending("message"),
+ id: MessageID.ascending(),
sessionID: ctx.sessionID,
role: "user",
time: {
@@ -55,7 +55,7 @@ export const PlanExitTool = Tool.define("plan_exit", {
}
await Session.updateMessage(userMsg)
await Session.updatePart({
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: userMsg.id,
sessionID: ctx.sessionID,
type: "text",
@@ -102,7 +102,7 @@ export const PlanEnterTool = Tool.define("plan_enter", {
const model = await getLastModel(ctx.sessionID)
const userMsg: MessageV2.User = {
- id: Identifier.ascending("message"),
+ id: MessageID.ascending(),
sessionID: ctx.sessionID,
role: "user",
time: {
@@ -113,7 +113,7 @@ export const PlanEnterTool = Tool.define("plan_enter", {
}
await Session.updateMessage(userMsg)
await Session.updatePart({
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: userMsg.id,
sessionID: ctx.sessionID,
type: "text",
diff --git a/packages/opencode/src/tool/schema.ts b/packages/opencode/src/tool/schema.ts
new file mode 100644
index 000000000..93f0f9a71
--- /dev/null
+++ b/packages/opencode/src/tool/schema.ts
@@ -0,0 +1,17 @@
+import { Schema } from "effect"
+import z from "zod"
+
+import { Identifier } from "@/id/id"
+import { withStatics } from "@/util/schema"
+
+const toolIdSchema = Schema.String.pipe(Schema.brand("ToolID"))
+
+export type ToolID = typeof toolIdSchema.Type
+
+export const ToolID = toolIdSchema.pipe(
+ withStatics((schema: typeof toolIdSchema) => ({
+ make: (id: string) => schema.makeUnsafe(id),
+ ascending: (id?: string) => schema.makeUnsafe(Identifier.ascending("tool", id)),
+ zod: Identifier.schema("tool").pipe(z.custom()),
+ })),
+)
diff --git a/packages/opencode/src/tool/task.ts b/packages/opencode/src/tool/task.ts
index 8c8cf827a..68e44eb97 100644
--- a/packages/opencode/src/tool/task.ts
+++ b/packages/opencode/src/tool/task.ts
@@ -2,6 +2,7 @@ import { Tool } from "./tool"
import DESCRIPTION from "./task.txt"
import z from "zod"
import { Session } from "../session"
+import { SessionID, MessageID } from "../session/schema"
import { MessageV2 } from "../session/message-v2"
import { Identifier } from "../id/id"
import { Agent } from "../agent/agent"
@@ -65,7 +66,7 @@ export const TaskTool = Tool.define("task", async (ctx) => {
const session = await iife(async () => {
if (params.task_id) {
- const found = await Session.get(params.task_id).catch(() => {})
+ const found = await Session.get(SessionID.make(params.task_id)).catch(() => {})
if (found) return found
}
@@ -116,7 +117,7 @@ export const TaskTool = Tool.define("task", async (ctx) => {
},
})
- const messageID = Identifier.ascending("message")
+ const messageID = MessageID.ascending()
function cancel() {
SessionPrompt.cancel(session.id)
diff --git a/packages/opencode/src/tool/tool.ts b/packages/opencode/src/tool/tool.ts
index 0e78ba665..8cc7b57d8 100644
--- a/packages/opencode/src/tool/tool.ts
+++ b/packages/opencode/src/tool/tool.ts
@@ -2,6 +2,7 @@ import z from "zod"
import type { MessageV2 } from "../session/message-v2"
import type { Agent } from "../agent/agent"
import type { PermissionNext } from "../permission/next"
+import type { SessionID, MessageID } from "../session/schema"
import { Truncate } from "./truncation"
export namespace Tool {
@@ -14,8 +15,8 @@ export namespace Tool {
}
export type Context = {
- sessionID: string
- messageID: string
+ sessionID: SessionID
+ messageID: MessageID
agent: string
abort: AbortSignal
callID?: string
diff --git a/packages/opencode/src/tool/truncation.ts b/packages/opencode/src/tool/truncation.ts
index 58b0cc13d..7c6a362a3 100644
--- a/packages/opencode/src/tool/truncation.ts
+++ b/packages/opencode/src/tool/truncation.ts
@@ -7,6 +7,7 @@ import type { Agent } from "../agent/agent"
import { Scheduler } from "../scheduler"
import { Filesystem } from "../util/filesystem"
import { Glob } from "../util/glob"
+import { ToolID } from "./schema"
export namespace Truncate {
export const MAX_LINES = 2000
@@ -90,7 +91,7 @@ export namespace Truncate {
const unit = hitBytes ? "bytes" : "lines"
const preview = out.join("\n")
- const id = Identifier.ascending("tool")
+ const id = ToolID.ascending()
const filepath = path.join(DIR, id)
await Filesystem.write(filepath, text)
diff --git a/packages/opencode/src/util/filesystem.ts b/packages/opencode/src/util/filesystem.ts
index fb1f5ab9e..37f00c6b9 100644
--- a/packages/opencode/src/util/filesystem.ts
+++ b/packages/opencode/src/util/filesystem.ts
@@ -114,8 +114,16 @@ export namespace Filesystem {
}
// We cannot rely on path.resolve() here because git.exe may come from Git Bash, Cygwin, or MSYS2, so we need to translate these paths at the boundary.
+ // Also resolves symlinks so that callers using the result as a cache key
+ // always get the same canonical path for a given physical directory.
export function resolve(p: string): string {
- return normalizePath(pathResolve(windowsPath(p)))
+ const resolved = pathResolve(windowsPath(p))
+ try {
+ return normalizePath(realpathSync(resolved))
+ } catch (e) {
+ if (isEnoent(e)) return normalizePath(resolved)
+ throw e
+ }
}
export function windowsPath(p: string): string {
diff --git a/packages/opencode/test/cli/github-action.test.ts b/packages/opencode/test/cli/github-action.test.ts
index cd64bb59e..279ed27d0 100644
--- a/packages/opencode/test/cli/github-action.test.ts
+++ b/packages/opencode/test/cli/github-action.test.ts
@@ -1,13 +1,14 @@
import { test, expect, describe } from "bun:test"
import { extractResponseText, formatPromptTooLargeError } from "../../src/cli/cmd/github"
import type { MessageV2 } from "../../src/session/message-v2"
+import { SessionID, MessageID, PartID } from "../../src/session/schema"
// Helper to create minimal valid parts
function createTextPart(text: string): MessageV2.Part {
return {
- id: "1",
- sessionID: "s",
- messageID: "m",
+ id: PartID.ascending(),
+ sessionID: SessionID.make("s"),
+ messageID: MessageID.make("m"),
type: "text" as const,
text,
}
@@ -15,9 +16,9 @@ function createTextPart(text: string): MessageV2.Part {
function createReasoningPart(text: string): MessageV2.Part {
return {
- id: "1",
- sessionID: "s",
- messageID: "m",
+ id: PartID.ascending(),
+ sessionID: SessionID.make("s"),
+ messageID: MessageID.make("m"),
type: "reasoning" as const,
text,
time: { start: 0 },
@@ -27,9 +28,9 @@ function createReasoningPart(text: string): MessageV2.Part {
function createToolPart(tool: string, title: string, status: "completed" | "running" = "completed"): MessageV2.Part {
if (status === "completed") {
return {
- id: "1",
- sessionID: "s",
- messageID: "m",
+ id: PartID.ascending(),
+ sessionID: SessionID.make("s"),
+ messageID: MessageID.make("m"),
type: "tool" as const,
callID: "c1",
tool,
@@ -44,9 +45,9 @@ function createToolPart(tool: string, title: string, status: "completed" | "runn
}
}
return {
- id: "1",
- sessionID: "s",
- messageID: "m",
+ id: PartID.ascending(),
+ sessionID: SessionID.make("s"),
+ messageID: MessageID.make("m"),
type: "tool" as const,
callID: "c1",
tool,
@@ -60,18 +61,18 @@ function createToolPart(tool: string, title: string, status: "completed" | "runn
function createStepStartPart(): MessageV2.Part {
return {
- id: "1",
- sessionID: "s",
- messageID: "m",
+ id: PartID.ascending(),
+ sessionID: SessionID.make("s"),
+ messageID: MessageID.make("m"),
type: "step-start" as const,
}
}
function createStepFinishPart(): MessageV2.Part {
return {
- id: "1",
- sessionID: "s",
- messageID: "m",
+ id: PartID.ascending(),
+ sessionID: SessionID.make("s"),
+ messageID: MessageID.make("m"),
type: "step-finish" as const,
reason: "done",
cost: 0,
diff --git a/packages/opencode/test/control-plane/session-proxy-middleware.test.ts b/packages/opencode/test/control-plane/session-proxy-middleware.test.ts
index c674d95ec..d4d152a1c 100644
--- a/packages/opencode/test/control-plane/session-proxy-middleware.test.ts
+++ b/packages/opencode/test/control-plane/session-proxy-middleware.test.ts
@@ -1,5 +1,5 @@
import { afterEach, describe, expect, mock, test } from "bun:test"
-import { Identifier } from "../../src/id/id"
+import { WorkspaceID } from "../../src/control-plane/schema"
import { Hono } from "hono"
import { tmpdir } from "../fixture/fixture"
import { Project } from "../../src/project/project"
@@ -64,8 +64,8 @@ async function setup(state: State) {
await using tmp = await tmpdir({ git: true })
const { project } = await Project.fromDirectory(tmp.path)
- const id1 = Identifier.descending("workspace")
- const id2 = Identifier.descending("workspace")
+ const id1 = WorkspaceID.ascending()
+ const id2 = WorkspaceID.ascending()
Database.use((db) =>
db
diff --git a/packages/opencode/test/control-plane/workspace-sync.test.ts b/packages/opencode/test/control-plane/workspace-sync.test.ts
index 899118920..0f8d608fb 100644
--- a/packages/opencode/test/control-plane/workspace-sync.test.ts
+++ b/packages/opencode/test/control-plane/workspace-sync.test.ts
@@ -1,5 +1,5 @@
import { afterEach, describe, expect, mock, test } from "bun:test"
-import { Identifier } from "../../src/id/id"
+import { WorkspaceID } from "../../src/control-plane/schema"
import { Log } from "../../src/util/log"
import { tmpdir } from "../fixture/fixture"
import { Project } from "../../src/project/project"
@@ -52,8 +52,8 @@ describe("control-plane/workspace.startSyncing", () => {
await using tmp = await tmpdir({ git: true })
const { project } = await Project.fromDirectory(tmp.path)
- const id1 = Identifier.descending("workspace")
- const id2 = Identifier.descending("workspace")
+ const id1 = WorkspaceID.ascending()
+ const id2 = WorkspaceID.ascending()
Database.use((db) =>
db
diff --git a/packages/opencode/test/memory/abort-leak.test.ts b/packages/opencode/test/memory/abort-leak.test.ts
index b202c9127..eebb651a5 100644
--- a/packages/opencode/test/memory/abort-leak.test.ts
+++ b/packages/opencode/test/memory/abort-leak.test.ts
@@ -2,12 +2,13 @@ import { describe, test, expect } from "bun:test"
import path from "path"
import { Instance } from "../../src/project/instance"
import { WebFetchTool } from "../../src/tool/webfetch"
+import { SessionID, MessageID } from "../../src/session/schema"
const projectRoot = path.join(__dirname, "../..")
const ctx = {
- sessionID: "test",
- messageID: "",
+ sessionID: SessionID.make("ses_test"),
+ messageID: MessageID.make(""),
callID: "",
agent: "build",
abort: new AbortController().signal,
diff --git a/packages/opencode/test/permission/next.test.ts b/packages/opencode/test/permission/next.test.ts
index add333204..7fd081899 100644
--- a/packages/opencode/test/permission/next.test.ts
+++ b/packages/opencode/test/permission/next.test.ts
@@ -1,8 +1,10 @@
import { test, expect } from "bun:test"
import os from "os"
import { PermissionNext } from "../../src/permission/next"
+import { PermissionID } from "../../src/permission/schema"
import { Instance } from "../../src/project/instance"
import { tmpdir } from "../fixture/fixture"
+import { SessionID } from "../../src/session/schema"
// fromConfig tests
@@ -462,7 +464,7 @@ test("ask - resolves immediately when action is allow", async () => {
directory: tmp.path,
fn: async () => {
const result = await PermissionNext.ask({
- sessionID: "session_test",
+ sessionID: SessionID.make("session_test"),
permission: "bash",
patterns: ["ls"],
metadata: {},
@@ -481,7 +483,7 @@ test("ask - throws RejectedError when action is deny", async () => {
fn: async () => {
await expect(
PermissionNext.ask({
- sessionID: "session_test",
+ sessionID: SessionID.make("session_test"),
permission: "bash",
patterns: ["rm -rf /"],
metadata: {},
@@ -499,7 +501,7 @@ test("ask - returns pending promise when action is ask", async () => {
directory: tmp.path,
fn: async () => {
const promise = PermissionNext.ask({
- sessionID: "session_test",
+ sessionID: SessionID.make("session_test"),
permission: "bash",
patterns: ["ls"],
metadata: {},
@@ -521,8 +523,8 @@ test("reply - once resolves the pending ask", async () => {
directory: tmp.path,
fn: async () => {
const askPromise = PermissionNext.ask({
- id: "permission_test1",
- sessionID: "session_test",
+ id: PermissionID.make("per_test1"),
+ sessionID: SessionID.make("session_test"),
permission: "bash",
patterns: ["ls"],
metadata: {},
@@ -531,7 +533,7 @@ test("reply - once resolves the pending ask", async () => {
})
await PermissionNext.reply({
- requestID: "permission_test1",
+ requestID: PermissionID.make("per_test1"),
reply: "once",
})
@@ -546,8 +548,8 @@ test("reply - reject throws RejectedError", async () => {
directory: tmp.path,
fn: async () => {
const askPromise = PermissionNext.ask({
- id: "permission_test2",
- sessionID: "session_test",
+ id: PermissionID.make("per_test2"),
+ sessionID: SessionID.make("session_test"),
permission: "bash",
patterns: ["ls"],
metadata: {},
@@ -556,7 +558,7 @@ test("reply - reject throws RejectedError", async () => {
})
await PermissionNext.reply({
- requestID: "permission_test2",
+ requestID: PermissionID.make("per_test2"),
reply: "reject",
})
@@ -571,8 +573,8 @@ test("reply - always persists approval and resolves", async () => {
directory: tmp.path,
fn: async () => {
const askPromise = PermissionNext.ask({
- id: "permission_test3",
- sessionID: "session_test",
+ id: PermissionID.make("per_test3"),
+ sessionID: SessionID.make("session_test"),
permission: "bash",
patterns: ["ls"],
metadata: {},
@@ -581,7 +583,7 @@ test("reply - always persists approval and resolves", async () => {
})
await PermissionNext.reply({
- requestID: "permission_test3",
+ requestID: PermissionID.make("per_test3"),
reply: "always",
})
@@ -594,7 +596,7 @@ test("reply - always persists approval and resolves", async () => {
fn: async () => {
// Stored approval should allow without asking
const result = await PermissionNext.ask({
- sessionID: "session_test2",
+ sessionID: SessionID.make("session_test2"),
permission: "bash",
patterns: ["ls"],
metadata: {},
@@ -612,8 +614,8 @@ test("reply - reject cancels all pending for same session", async () => {
directory: tmp.path,
fn: async () => {
const askPromise1 = PermissionNext.ask({
- id: "permission_test4a",
- sessionID: "session_same",
+ id: PermissionID.make("per_test4a"),
+ sessionID: SessionID.make("session_same"),
permission: "bash",
patterns: ["ls"],
metadata: {},
@@ -622,8 +624,8 @@ test("reply - reject cancels all pending for same session", async () => {
})
const askPromise2 = PermissionNext.ask({
- id: "permission_test4b",
- sessionID: "session_same",
+ id: PermissionID.make("per_test4b"),
+ sessionID: SessionID.make("session_same"),
permission: "edit",
patterns: ["foo.ts"],
metadata: {},
@@ -637,7 +639,7 @@ test("reply - reject cancels all pending for same session", async () => {
// Reject the first one
await PermissionNext.reply({
- requestID: "permission_test4a",
+ requestID: PermissionID.make("per_test4a"),
reply: "reject",
})
@@ -655,7 +657,7 @@ test("ask - checks all patterns and stops on first deny", async () => {
fn: async () => {
await expect(
PermissionNext.ask({
- sessionID: "session_test",
+ sessionID: SessionID.make("session_test"),
permission: "bash",
patterns: ["echo hello", "rm -rf /"],
metadata: {},
@@ -676,7 +678,7 @@ test("ask - allows all patterns when all match allow rules", async () => {
directory: tmp.path,
fn: async () => {
const result = await PermissionNext.ask({
- sessionID: "session_test",
+ sessionID: SessionID.make("session_test"),
permission: "bash",
patterns: ["echo hello", "ls -la", "pwd"],
metadata: {},
diff --git a/packages/opencode/test/question/question.test.ts b/packages/opencode/test/question/question.test.ts
index cf24faa7d..f00afb09f 100644
--- a/packages/opencode/test/question/question.test.ts
+++ b/packages/opencode/test/question/question.test.ts
@@ -1,7 +1,9 @@
import { test, expect } from "bun:test"
import { Question } from "../../src/question"
import { Instance } from "../../src/project/instance"
+import { QuestionID } from "../../src/question/schema"
import { tmpdir } from "../fixture/fixture"
+import { SessionID } from "../../src/session/schema"
test("ask - returns pending promise", async () => {
await using tmp = await tmpdir({ git: true })
@@ -9,7 +11,7 @@ test("ask - returns pending promise", async () => {
directory: tmp.path,
fn: async () => {
const promise = Question.ask({
- sessionID: "ses_test",
+ sessionID: SessionID.make("ses_test"),
questions: [
{
question: "What would you like to do?",
@@ -43,7 +45,7 @@ test("ask - adds to pending list", async () => {
]
Question.ask({
- sessionID: "ses_test",
+ sessionID: SessionID.make("ses_test"),
questions,
})
@@ -73,7 +75,7 @@ test("reply - resolves the pending ask with answers", async () => {
]
const askPromise = Question.ask({
- sessionID: "ses_test",
+ sessionID: SessionID.make("ses_test"),
questions,
})
@@ -97,7 +99,7 @@ test("reply - removes from pending list", async () => {
directory: tmp.path,
fn: async () => {
Question.ask({
- sessionID: "ses_test",
+ sessionID: SessionID.make("ses_test"),
questions: [
{
question: "What would you like to do?",
@@ -130,7 +132,7 @@ test("reply - does nothing for unknown requestID", async () => {
directory: tmp.path,
fn: async () => {
await Question.reply({
- requestID: "que_unknown",
+ requestID: QuestionID.make("que_unknown"),
answers: [["Option 1"]],
})
// Should not throw
@@ -146,7 +148,7 @@ test("reject - throws RejectedError", async () => {
directory: tmp.path,
fn: async () => {
const askPromise = Question.ask({
- sessionID: "ses_test",
+ sessionID: SessionID.make("ses_test"),
questions: [
{
question: "What would you like to do?",
@@ -173,7 +175,7 @@ test("reject - removes from pending list", async () => {
directory: tmp.path,
fn: async () => {
const askPromise = Question.ask({
- sessionID: "ses_test",
+ sessionID: SessionID.make("ses_test"),
questions: [
{
question: "What would you like to do?",
@@ -203,7 +205,7 @@ test("reject - does nothing for unknown requestID", async () => {
await Instance.provide({
directory: tmp.path,
fn: async () => {
- await Question.reject("que_unknown")
+ await Question.reject(QuestionID.make("que_unknown"))
// Should not throw
},
})
@@ -236,7 +238,7 @@ test("ask - handles multiple questions", async () => {
]
const askPromise = Question.ask({
- sessionID: "ses_test",
+ sessionID: SessionID.make("ses_test"),
questions,
})
@@ -261,7 +263,7 @@ test("list - returns all pending requests", async () => {
directory: tmp.path,
fn: async () => {
Question.ask({
- sessionID: "ses_test1",
+ sessionID: SessionID.make("ses_test1"),
questions: [
{
question: "Question 1?",
@@ -272,7 +274,7 @@ test("list - returns all pending requests", async () => {
})
Question.ask({
- sessionID: "ses_test2",
+ sessionID: SessionID.make("ses_test2"),
questions: [
{
question: "Question 2?",
diff --git a/packages/opencode/test/session/llm.test.ts b/packages/opencode/test/session/llm.test.ts
index a89a00ebc..df9dedb35 100644
--- a/packages/opencode/test/session/llm.test.ts
+++ b/packages/opencode/test/session/llm.test.ts
@@ -11,6 +11,7 @@ import { Filesystem } from "../../src/util/filesystem"
import { tmpdir } from "../fixture/fixture"
import type { Agent } from "../../src/agent/agent"
import type { MessageV2 } from "../../src/session/message-v2"
+import { SessionID, MessageID } from "../../src/session/schema"
describe("session.llm.hasToolCalls", () => {
test("returns false for empty messages array", () => {
@@ -265,7 +266,7 @@ describe("session.llm.stream", () => {
directory: tmp.path,
fn: async () => {
const resolved = await Provider.getModel(providerID, model.id)
- const sessionID = "session-test-1"
+ const sessionID = SessionID.make("session-test-1")
const agent = {
name: "test",
mode: "primary",
@@ -276,7 +277,7 @@ describe("session.llm.stream", () => {
} satisfies Agent.Info
const user = {
- id: "user-1",
+ id: MessageID.make("user-1"),
sessionID,
role: "user",
time: { created: Date.now() },
@@ -395,7 +396,7 @@ describe("session.llm.stream", () => {
directory: tmp.path,
fn: async () => {
const resolved = await Provider.getModel("openai", model.id)
- const sessionID = "session-test-2"
+ const sessionID = SessionID.make("session-test-2")
const agent = {
name: "test",
mode: "primary",
@@ -405,7 +406,7 @@ describe("session.llm.stream", () => {
} satisfies Agent.Info
const user = {
- id: "user-2",
+ id: MessageID.make("user-2"),
sessionID,
role: "user",
time: { created: Date.now() },
@@ -517,7 +518,7 @@ describe("session.llm.stream", () => {
directory: tmp.path,
fn: async () => {
const resolved = await Provider.getModel(providerID, model.id)
- const sessionID = "session-test-3"
+ const sessionID = SessionID.make("session-test-3")
const agent = {
name: "test",
mode: "primary",
@@ -528,7 +529,7 @@ describe("session.llm.stream", () => {
} satisfies Agent.Info
const user = {
- id: "user-3",
+ id: MessageID.make("user-3"),
sessionID,
role: "user",
time: { created: Date.now() },
@@ -618,7 +619,7 @@ describe("session.llm.stream", () => {
directory: tmp.path,
fn: async () => {
const resolved = await Provider.getModel(providerID, model.id)
- const sessionID = "session-test-4"
+ const sessionID = SessionID.make("session-test-4")
const agent = {
name: "test",
mode: "primary",
@@ -629,7 +630,7 @@ describe("session.llm.stream", () => {
} satisfies Agent.Info
const user = {
- id: "user-4",
+ id: MessageID.make("user-4"),
sessionID,
role: "user",
time: { created: Date.now() },
diff --git a/packages/opencode/test/session/message-v2.test.ts b/packages/opencode/test/session/message-v2.test.ts
index 184bcd3ef..1a7c75c05 100644
--- a/packages/opencode/test/session/message-v2.test.ts
+++ b/packages/opencode/test/session/message-v2.test.ts
@@ -2,8 +2,9 @@ import { describe, expect, test } from "bun:test"
import { APICallError } from "ai"
import { MessageV2 } from "../../src/session/message-v2"
import type { Provider } from "../../src/provider/provider"
+import { SessionID, MessageID, PartID } from "../../src/session/schema"
-const sessionID = "session"
+const sessionID = SessionID.make("session")
const model: Provider.Model = {
id: "test-model",
providerID: "test",
@@ -97,9 +98,9 @@ function assistantInfo(
function basePart(messageID: string, id: string) {
return {
- id,
+ id: PartID.make(id),
sessionID,
- messageID,
+ messageID: MessageID.make(messageID),
}
}
diff --git a/packages/opencode/test/session/revert-compact.test.ts b/packages/opencode/test/session/revert-compact.test.ts
index de2b14573..1a5844bc9 100644
--- a/packages/opencode/test/session/revert-compact.test.ts
+++ b/packages/opencode/test/session/revert-compact.test.ts
@@ -6,7 +6,7 @@ import { SessionCompaction } from "../../src/session/compaction"
import { MessageV2 } from "../../src/session/message-v2"
import { Log } from "../../src/util/log"
import { Instance } from "../../src/project/instance"
-import { Identifier } from "../../src/id/id"
+import { MessageID, PartID } from "../../src/session/schema"
import { tmpdir } from "../fixture/fixture"
const projectRoot = path.join(__dirname, "../..")
@@ -24,7 +24,7 @@ describe("revert + compact workflow", () => {
// Create a user message
const userMsg1 = await Session.updateMessage({
- id: Identifier.ascending("message"),
+ id: MessageID.ascending(),
role: "user",
sessionID,
agent: "default",
@@ -39,7 +39,7 @@ describe("revert + compact workflow", () => {
// Add a text part to the user message
await Session.updatePart({
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: userMsg1.id,
sessionID,
type: "text",
@@ -48,7 +48,7 @@ describe("revert + compact workflow", () => {
// Create an assistant response message
const assistantMsg1: MessageV2.Assistant = {
- id: Identifier.ascending("message"),
+ id: MessageID.ascending(),
role: "assistant",
sessionID,
mode: "default",
@@ -76,7 +76,7 @@ describe("revert + compact workflow", () => {
// Add a text part to the assistant message
await Session.updatePart({
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: assistantMsg1.id,
sessionID,
type: "text",
@@ -85,7 +85,7 @@ describe("revert + compact workflow", () => {
// Create another user message
const userMsg2 = await Session.updateMessage({
- id: Identifier.ascending("message"),
+ id: MessageID.ascending(),
role: "user",
sessionID,
agent: "default",
@@ -99,7 +99,7 @@ describe("revert + compact workflow", () => {
})
await Session.updatePart({
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: userMsg2.id,
sessionID,
type: "text",
@@ -108,7 +108,7 @@ describe("revert + compact workflow", () => {
// Create another assistant response
const assistantMsg2: MessageV2.Assistant = {
- id: Identifier.ascending("message"),
+ id: MessageID.ascending(),
role: "assistant",
sessionID,
mode: "default",
@@ -135,7 +135,7 @@ describe("revert + compact workflow", () => {
await Session.updateMessage(assistantMsg2)
await Session.updatePart({
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: assistantMsg2.id,
sessionID,
type: "text",
@@ -200,7 +200,7 @@ describe("revert + compact workflow", () => {
// Create initial messages
const userMsg = await Session.updateMessage({
- id: Identifier.ascending("message"),
+ id: MessageID.ascending(),
role: "user",
sessionID,
agent: "default",
@@ -214,7 +214,7 @@ describe("revert + compact workflow", () => {
})
await Session.updatePart({
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: userMsg.id,
sessionID,
type: "text",
@@ -222,7 +222,7 @@ describe("revert + compact workflow", () => {
})
const assistantMsg: MessageV2.Assistant = {
- id: Identifier.ascending("message"),
+ id: MessageID.ascending(),
role: "assistant",
sessionID,
mode: "default",
@@ -249,7 +249,7 @@ describe("revert + compact workflow", () => {
await Session.updateMessage(assistantMsg)
await Session.updatePart({
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID: assistantMsg.id,
sessionID,
type: "text",
diff --git a/packages/opencode/test/session/session.test.ts b/packages/opencode/test/session/session.test.ts
index aa9ca05d0..233258622 100644
--- a/packages/opencode/test/session/session.test.ts
+++ b/packages/opencode/test/session/session.test.ts
@@ -5,7 +5,7 @@ import { Bus } from "../../src/bus"
import { Log } from "../../src/util/log"
import { Instance } from "../../src/project/instance"
import { MessageV2 } from "../../src/session/message-v2"
-import { Identifier } from "../../src/id/id"
+import { MessageID, PartID } from "../../src/session/schema"
const projectRoot = path.join(__dirname, "../..")
Log.init({ print: false })
@@ -81,7 +81,7 @@ describe("step-finish token propagation via Bus event", () => {
fn: async () => {
const session = await Session.create({})
- const messageID = Identifier.ascending("message")
+ const messageID = MessageID.ascending()
await Session.updateMessage({
id: messageID,
sessionID: session.id,
@@ -107,7 +107,7 @@ describe("step-finish token propagation via Bus event", () => {
}
const partInput = {
- id: Identifier.ascending("part"),
+ id: PartID.ascending(),
messageID,
sessionID: session.id,
type: "step-finish" as const,
diff --git a/packages/opencode/test/session/structured-output.test.ts b/packages/opencode/test/session/structured-output.test.ts
index 2be4257dc..f6131b149 100644
--- a/packages/opencode/test/session/structured-output.test.ts
+++ b/packages/opencode/test/session/structured-output.test.ts
@@ -1,6 +1,7 @@
import { describe, expect, test } from "bun:test"
import { MessageV2 } from "../../src/session/message-v2"
import { SessionPrompt } from "../../src/session/prompt"
+import { SessionID, MessageID } from "../../src/session/schema"
describe("structured-output.OutputFormat", () => {
test("parses text format", () => {
@@ -95,8 +96,8 @@ describe("structured-output.StructuredOutputError", () => {
describe("structured-output.UserMessage", () => {
test("user message accepts outputFormat", () => {
const result = MessageV2.User.safeParse({
- id: "test-id",
- sessionID: "test-session",
+ id: MessageID.ascending(),
+ sessionID: SessionID.descending(),
role: "user",
time: { created: Date.now() },
agent: "default",
@@ -111,8 +112,8 @@ describe("structured-output.UserMessage", () => {
test("user message works without outputFormat (optional)", () => {
const result = MessageV2.User.safeParse({
- id: "test-id",
- sessionID: "test-session",
+ id: MessageID.ascending(),
+ sessionID: SessionID.descending(),
role: "user",
time: { created: Date.now() },
agent: "default",
@@ -124,10 +125,10 @@ describe("structured-output.UserMessage", () => {
describe("structured-output.AssistantMessage", () => {
const baseAssistantMessage = {
- id: "test-id",
- sessionID: "test-session",
+ id: MessageID.ascending(),
+ sessionID: SessionID.descending(),
role: "assistant" as const,
- parentID: "parent-id",
+ parentID: MessageID.ascending(),
modelID: "claude-3",
providerID: "anthropic",
mode: "default",
diff --git a/packages/opencode/test/storage/json-migration.test.ts b/packages/opencode/test/storage/json-migration.test.ts
index 76dfb8b45..a714f1147 100644
--- a/packages/opencode/test/storage/json-migration.test.ts
+++ b/packages/opencode/test/storage/json-migration.test.ts
@@ -11,6 +11,7 @@ import { ProjectTable } from "../../src/project/project.sql"
import { ProjectID } from "../../src/project/schema"
import { SessionTable, MessageTable, PartTable, TodoTable, PermissionTable } from "../../src/session/session.sql"
import { SessionShareTable } from "../../src/share/share.sql"
+import { SessionID, MessageID, PartID } from "../../src/session/schema"
// Test fixtures
const fixtures = {
@@ -220,7 +221,7 @@ describe("JSON to SQLite migration", () => {
const db = drizzle({ client: sqlite })
const sessions = db.select().from(SessionTable).all()
expect(sessions.length).toBe(1)
- expect(sessions[0].id).toBe("ses_test456def")
+ expect(sessions[0].id).toBe(SessionID.make("ses_test456def"))
expect(sessions[0].project_id).toBe(ProjectID.make("proj_test123abc"))
expect(sessions[0].slug).toBe("test-session")
expect(sessions[0].title).toBe("Test Session Title")
@@ -254,11 +255,11 @@ describe("JSON to SQLite migration", () => {
const db = drizzle({ client: sqlite })
const messages = db.select().from(MessageTable).all()
expect(messages.length).toBe(1)
- expect(messages[0].id).toBe("msg_test789ghi")
+ expect(messages[0].id).toBe(MessageID.make("msg_test789ghi"))
const parts = db.select().from(PartTable).all()
expect(parts.length).toBe(1)
- expect(parts[0].id).toBe("prt_testabc123")
+ expect(parts[0].id).toBe(PartID.make("prt_testabc123"))
})
test("migrates legacy parts without ids in body", async () => {
@@ -294,16 +295,16 @@ describe("JSON to SQLite migration", () => {
const db = drizzle({ client: sqlite })
const messages = db.select().from(MessageTable).all()
expect(messages.length).toBe(1)
- expect(messages[0].id).toBe("msg_test789ghi")
- expect(messages[0].session_id).toBe("ses_test456def")
+ expect(messages[0].id).toBe(MessageID.make("msg_test789ghi"))
+ expect(messages[0].session_id).toBe(SessionID.make("ses_test456def"))
expect(messages[0].data).not.toHaveProperty("id")
expect(messages[0].data).not.toHaveProperty("sessionID")
const parts = db.select().from(PartTable).all()
expect(parts.length).toBe(1)
- expect(parts[0].id).toBe("prt_testabc123")
- expect(parts[0].message_id).toBe("msg_test789ghi")
- expect(parts[0].session_id).toBe("ses_test456def")
+ expect(parts[0].id).toBe(PartID.make("prt_testabc123"))
+ expect(parts[0].message_id).toBe(MessageID.make("msg_test789ghi"))
+ expect(parts[0].session_id).toBe(SessionID.make("ses_test456def"))
expect(parts[0].data).not.toHaveProperty("id")
expect(parts[0].data).not.toHaveProperty("messageID")
expect(parts[0].data).not.toHaveProperty("sessionID")
@@ -335,8 +336,8 @@ describe("JSON to SQLite migration", () => {
const db = drizzle({ client: sqlite })
const messages = db.select().from(MessageTable).all()
expect(messages.length).toBe(1)
- expect(messages[0].id).toBe("msg_from_filename") // Uses filename, not JSON id
- expect(messages[0].session_id).toBe("ses_test456def")
+ expect(messages[0].id).toBe(MessageID.make("msg_from_filename")) // Uses filename, not JSON id
+ expect(messages[0].session_id).toBe(SessionID.make("ses_test456def"))
})
test("uses paths for part id and messageID when JSON has different values", async () => {
@@ -373,8 +374,8 @@ describe("JSON to SQLite migration", () => {
const db = drizzle({ client: sqlite })
const parts = db.select().from(PartTable).all()
expect(parts.length).toBe(1)
- expect(parts[0].id).toBe("prt_from_filename") // Uses filename, not JSON id
- expect(parts[0].message_id).toBe("msg_realmsgid") // Uses parent dir, not JSON messageID
+ expect(parts[0].id).toBe(PartID.make("prt_from_filename")) // Uses filename, not JSON id
+ expect(parts[0].message_id).toBe(MessageID.make("msg_realmsgid")) // Uses parent dir, not JSON messageID
})
test("skips orphaned sessions (no parent project)", async () => {
@@ -426,7 +427,7 @@ describe("JSON to SQLite migration", () => {
const db = drizzle({ client: sqlite })
const sessions = db.select().from(SessionTable).all()
expect(sessions.length).toBe(1)
- expect(sessions[0].id).toBe("ses_migrated")
+ expect(sessions[0].id).toBe(SessionID.make("ses_migrated"))
expect(sessions[0].project_id).toBe(ProjectID.make(gitBasedProjectID)) // Uses directory, not stale JSON
})
@@ -458,7 +459,7 @@ describe("JSON to SQLite migration", () => {
const db = drizzle({ client: sqlite })
const sessions = db.select().from(SessionTable).all()
expect(sessions.length).toBe(1)
- expect(sessions[0].id).toBe("ses_from_filename") // Uses filename, not JSON id
+ expect(sessions[0].id).toBe(SessionID.make("ses_from_filename")) // Uses filename, not JSON id
expect(sessions[0].project_id).toBe(ProjectID.make("proj_test123abc"))
})
diff --git a/packages/opencode/test/tool/apply_patch.test.ts b/packages/opencode/test/tool/apply_patch.test.ts
index f81723fee..4e276517f 100644
--- a/packages/opencode/test/tool/apply_patch.test.ts
+++ b/packages/opencode/test/tool/apply_patch.test.ts
@@ -4,10 +4,11 @@ import * as fs from "fs/promises"
import { ApplyPatchTool } from "../../src/tool/apply_patch"
import { Instance } from "../../src/project/instance"
import { tmpdir } from "../fixture/fixture"
+import { SessionID, MessageID } from "../../src/session/schema"
const baseCtx = {
- sessionID: "test",
- messageID: "",
+ sessionID: SessionID.make("ses_test"),
+ messageID: MessageID.make(""),
callID: "",
agent: "build",
abort: AbortSignal.any([]),
diff --git a/packages/opencode/test/tool/bash.test.ts b/packages/opencode/test/tool/bash.test.ts
index ac9301692..f947398b3 100644
--- a/packages/opencode/test/tool/bash.test.ts
+++ b/packages/opencode/test/tool/bash.test.ts
@@ -7,10 +7,11 @@ import { Filesystem } from "../../src/util/filesystem"
import { tmpdir } from "../fixture/fixture"
import type { PermissionNext } from "../../src/permission/next"
import { Truncate } from "../../src/tool/truncation"
+import { SessionID, MessageID } from "../../src/session/schema"
const ctx = {
- sessionID: "test",
- messageID: "",
+ sessionID: SessionID.make("ses_test"),
+ messageID: MessageID.make(""),
callID: "",
agent: "build",
abort: AbortSignal.any([]),
diff --git a/packages/opencode/test/tool/edit.test.ts b/packages/opencode/test/tool/edit.test.ts
index bcf75da05..b0ee95ff6 100644
--- a/packages/opencode/test/tool/edit.test.ts
+++ b/packages/opencode/test/tool/edit.test.ts
@@ -5,10 +5,11 @@ import { EditTool } from "../../src/tool/edit"
import { Instance } from "../../src/project/instance"
import { tmpdir } from "../fixture/fixture"
import { FileTime } from "../../src/file/time"
+import { SessionID, MessageID } from "../../src/session/schema"
const ctx = {
- sessionID: "test-edit-session",
- messageID: "",
+ sessionID: SessionID.make("ses_test-edit-session"),
+ messageID: MessageID.make(""),
callID: "",
agent: "build",
abort: AbortSignal.any([]),
diff --git a/packages/opencode/test/tool/external-directory.test.ts b/packages/opencode/test/tool/external-directory.test.ts
index a75f767b3..58e53e583 100644
--- a/packages/opencode/test/tool/external-directory.test.ts
+++ b/packages/opencode/test/tool/external-directory.test.ts
@@ -4,10 +4,11 @@ import type { Tool } from "../../src/tool/tool"
import { Instance } from "../../src/project/instance"
import { assertExternalDirectory } from "../../src/tool/external-directory"
import type { PermissionNext } from "../../src/permission/next"
+import { SessionID, MessageID } from "../../src/session/schema"
const baseCtx: Omit = {
- sessionID: "test",
- messageID: "",
+ sessionID: SessionID.make("ses_test"),
+ messageID: MessageID.make(""),
callID: "",
agent: "build",
abort: AbortSignal.any([]),
diff --git a/packages/opencode/test/tool/grep.test.ts b/packages/opencode/test/tool/grep.test.ts
index e774580df..e03b1752e 100644
--- a/packages/opencode/test/tool/grep.test.ts
+++ b/packages/opencode/test/tool/grep.test.ts
@@ -3,10 +3,11 @@ import path from "path"
import { GrepTool } from "../../src/tool/grep"
import { Instance } from "../../src/project/instance"
import { tmpdir } from "../fixture/fixture"
+import { SessionID, MessageID } from "../../src/session/schema"
const ctx = {
- sessionID: "test",
- messageID: "",
+ sessionID: SessionID.make("ses_test"),
+ messageID: MessageID.make(""),
callID: "",
agent: "build",
abort: AbortSignal.any([]),
diff --git a/packages/opencode/test/tool/question.test.ts b/packages/opencode/test/tool/question.test.ts
index 4a436186d..9157aaa9a 100644
--- a/packages/opencode/test/tool/question.test.ts
+++ b/packages/opencode/test/tool/question.test.ts
@@ -2,10 +2,11 @@ import { describe, expect, test, spyOn, beforeEach, afterEach } from "bun:test"
import { z } from "zod"
import { QuestionTool } from "../../src/tool/question"
import * as QuestionModule from "../../src/question"
+import { SessionID, MessageID } from "../../src/session/schema"
const ctx = {
- sessionID: "test-session",
- messageID: "test-message",
+ sessionID: SessionID.make("ses_test-session"),
+ messageID: MessageID.make("test-message"),
callID: "test-call",
agent: "test-agent",
abort: AbortSignal.any([]),
diff --git a/packages/opencode/test/tool/read.test.ts b/packages/opencode/test/tool/read.test.ts
index b22fc3e71..7659d690c 100644
--- a/packages/opencode/test/tool/read.test.ts
+++ b/packages/opencode/test/tool/read.test.ts
@@ -6,12 +6,13 @@ import { Filesystem } from "../../src/util/filesystem"
import { tmpdir } from "../fixture/fixture"
import { PermissionNext } from "../../src/permission/next"
import { Agent } from "../../src/agent/agent"
+import { SessionID, MessageID } from "../../src/session/schema"
const FIXTURES_DIR = path.join(import.meta.dir, "fixtures")
const ctx = {
- sessionID: "test",
- messageID: "",
+ sessionID: SessionID.make("ses_test"),
+ messageID: MessageID.make(""),
callID: "",
agent: "build",
abort: AbortSignal.any([]),
diff --git a/packages/opencode/test/tool/skill.test.ts b/packages/opencode/test/tool/skill.test.ts
index c47259f15..5bcdb6c2b 100644
--- a/packages/opencode/test/tool/skill.test.ts
+++ b/packages/opencode/test/tool/skill.test.ts
@@ -6,10 +6,11 @@ import type { Tool } from "../../src/tool/tool"
import { Instance } from "../../src/project/instance"
import { SkillTool } from "../../src/tool/skill"
import { tmpdir } from "../fixture/fixture"
+import { SessionID, MessageID } from "../../src/session/schema"
const baseCtx: Omit = {
- sessionID: "test",
- messageID: "",
+ sessionID: SessionID.make("ses_test"),
+ messageID: MessageID.make(""),
callID: "",
agent: "build",
abort: AbortSignal.any([]),
diff --git a/packages/opencode/test/tool/webfetch.test.ts b/packages/opencode/test/tool/webfetch.test.ts
index 0214700fe..088f3dd16 100644
--- a/packages/opencode/test/tool/webfetch.test.ts
+++ b/packages/opencode/test/tool/webfetch.test.ts
@@ -2,12 +2,13 @@ import { describe, expect, test } from "bun:test"
import path from "path"
import { Instance } from "../../src/project/instance"
import { WebFetchTool } from "../../src/tool/webfetch"
+import { SessionID, MessageID } from "../../src/session/schema"
const projectRoot = path.join(import.meta.dir, "../..")
const ctx = {
- sessionID: "test",
- messageID: "message",
+ sessionID: SessionID.make("ses_test"),
+ messageID: MessageID.make("message"),
callID: "",
agent: "build",
abort: AbortSignal.any([]),
diff --git a/packages/opencode/test/tool/write.test.ts b/packages/opencode/test/tool/write.test.ts
index 695d48ccb..b93ab4e85 100644
--- a/packages/opencode/test/tool/write.test.ts
+++ b/packages/opencode/test/tool/write.test.ts
@@ -4,10 +4,11 @@ import fs from "fs/promises"
import { WriteTool } from "../../src/tool/write"
import { Instance } from "../../src/project/instance"
import { tmpdir } from "../fixture/fixture"
+import { SessionID, MessageID } from "../../src/session/schema"
const ctx = {
- sessionID: "test-write-session",
- messageID: "",
+ sessionID: SessionID.make("ses_test-write-session"),
+ messageID: MessageID.make(""),
callID: "",
agent: "build",
abort: AbortSignal.any([]),
diff --git a/packages/opencode/test/util/filesystem.test.ts b/packages/opencode/test/util/filesystem.test.ts
index c757e3424..aea0b1db8 100644
--- a/packages/opencode/test/util/filesystem.test.ts
+++ b/packages/opencode/test/util/filesystem.test.ts
@@ -502,5 +502,57 @@ describe("filesystem", () => {
const drive = tmp.path[0].toLowerCase()
expect(Filesystem.resolve(`/mnt/${drive}`)).toBe(Filesystem.resolve(`${drive.toUpperCase()}:/`))
})
+
+ test("resolves symlinked directory to canonical path", async () => {
+ await using tmp = await tmpdir()
+ const target = path.join(tmp.path, "real")
+ await fs.mkdir(target)
+ const link = path.join(tmp.path, "link")
+ await fs.symlink(target, link)
+ expect(Filesystem.resolve(link)).toBe(Filesystem.resolve(target))
+ })
+
+ test("returns unresolved path when target does not exist", async () => {
+ await using tmp = await tmpdir()
+ const missing = path.join(tmp.path, "does-not-exist-" + Date.now())
+ const result = Filesystem.resolve(missing)
+ expect(result).toBe(Filesystem.normalizePath(path.resolve(missing)))
+ })
+
+ test("throws ELOOP on symlink cycle", async () => {
+ await using tmp = await tmpdir()
+ const a = path.join(tmp.path, "a")
+ const b = path.join(tmp.path, "b")
+ await fs.symlink(b, a)
+ await fs.symlink(a, b)
+ expect(() => Filesystem.resolve(a)).toThrow()
+ })
+
+ // Windows: chmod(0o000) is a no-op, so EACCES cannot be triggered
+ test("throws EACCES on permission-denied symlink target", async () => {
+ if (process.platform === "win32") return
+ if (process.getuid?.() === 0) return // skip when running as root
+ await using tmp = await tmpdir()
+ const dir = path.join(tmp.path, "restricted")
+ await fs.mkdir(dir)
+ const link = path.join(tmp.path, "link")
+ await fs.symlink(dir, link)
+ await fs.chmod(dir, 0o000)
+ try {
+ expect(() => Filesystem.resolve(path.join(link, "child"))).toThrow()
+ } finally {
+ await fs.chmod(dir, 0o755)
+ }
+ })
+
+ // Windows: traversing through a file throws ENOENT (not ENOTDIR),
+ // which resolve() catches as a fallback instead of rethrowing
+ test("rethrows non-ENOENT errors", async () => {
+ if (process.platform === "win32") return
+ await using tmp = await tmpdir()
+ const file = path.join(tmp.path, "not-a-directory")
+ await fs.writeFile(file, "x")
+ expect(() => Filesystem.resolve(path.join(file, "child"))).toThrow()
+ })
})
})
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index a47b18db2..30568c96d 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -2970,9 +2970,6 @@ export type SessionChildrenResponse = SessionChildrenResponses[keyof SessionChil
export type SessionTodoData = {
body?: never
path: {
- /**
- * Session ID
- */
sessionID: string
}
query?: {
@@ -3011,9 +3008,6 @@ export type SessionInitData = {
messageID: string
}
path: {
- /**
- * Session ID
- */
sessionID: string
}
query?: {
@@ -3199,9 +3193,6 @@ export type SessionSummarizeData = {
auto?: boolean
}
path: {
- /**
- * Session ID
- */
sessionID: string
}
query?: {
@@ -3236,9 +3227,6 @@ export type SessionSummarizeResponse = SessionSummarizeResponses[keyof SessionSu
export type SessionMessagesData = {
body?: never
path: {
- /**
- * Session ID
- */
sessionID: string
}
query?: {
@@ -3295,9 +3283,6 @@ export type SessionPromptData = {
parts: Array
}
path: {
- /**
- * Session ID
- */
sessionID: string
}
query?: {
@@ -3335,13 +3320,7 @@ export type SessionPromptResponse = SessionPromptResponses[keyof SessionPromptRe
export type SessionDeleteMessageData = {
body?: never
path: {
- /**
- * Session ID
- */
sessionID: string
- /**
- * Message ID
- */
messageID: string
}
query?: {
@@ -3376,13 +3355,7 @@ export type SessionDeleteMessageResponse = SessionDeleteMessageResponses[keyof S
export type SessionMessageData = {
body?: never
path: {
- /**
- * Session ID
- */
sessionID: string
- /**
- * Message ID
- */
messageID: string
}
query?: {
@@ -3420,17 +3393,8 @@ export type SessionMessageResponse = SessionMessageResponses[keyof SessionMessag
export type PartDeleteData = {
body?: never
path: {
- /**
- * Session ID
- */
sessionID: string
- /**
- * Message ID
- */
messageID: string
- /**
- * Part ID
- */
partID: string
}
query?: {
@@ -3465,17 +3429,8 @@ export type PartDeleteResponse = PartDeleteResponses[keyof PartDeleteResponses]
export type PartUpdateData = {
body?: Part
path: {
- /**
- * Session ID
- */
sessionID: string
- /**
- * Message ID
- */
messageID: string
- /**
- * Part ID
- */
partID: string
}
query?: {
@@ -3528,9 +3483,6 @@ export type SessionPromptAsyncData = {
parts: Array
}
path: {
- /**
- * Session ID
- */
sessionID: string
}
query?: {
@@ -3580,9 +3532,6 @@ export type SessionCommandData = {
}>
}
path: {
- /**
- * Session ID
- */
sessionID: string
}
query?: {
@@ -3627,9 +3576,6 @@ export type SessionShellData = {
command: string
}
path: {
- /**
- * Session ID
- */
sessionID: string
}
query?: {
diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json
index c3e54a7a1..a5e10f0d7 100644
--- a/packages/sdk/openapi.json
+++ b/packages/sdk/openapi.json
@@ -637,7 +637,8 @@
"in": "path",
"name": "ptyID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^pty.*"
},
"required": true
}
@@ -694,7 +695,8 @@
"in": "path",
"name": "ptyID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^pty.*"
},
"required": true
}
@@ -777,7 +779,8 @@
"in": "path",
"name": "ptyID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^pty.*"
},
"required": true
}
@@ -836,7 +839,8 @@
"in": "path",
"name": "ptyID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^pty.*"
},
"required": true
}
@@ -2066,7 +2070,8 @@
"in": "path",
"name": "sessionID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"required": true
}
@@ -2231,10 +2236,10 @@
"in": "path",
"name": "sessionID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
- "required": true,
- "description": "Session ID"
+ "required": true
}
],
"summary": "Get session todos",
@@ -2304,10 +2309,10 @@
"in": "path",
"name": "sessionID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
- "required": true,
- "description": "Session ID"
+ "required": true
}
],
"summary": "Initialize session",
@@ -2461,7 +2466,8 @@
"in": "path",
"name": "sessionID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"required": true
}
@@ -2530,7 +2536,8 @@
"in": "path",
"name": "sessionID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"required": true
}
@@ -2728,10 +2735,10 @@
"in": "path",
"name": "sessionID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
- "required": true,
- "description": "Session ID"
+ "required": true
}
],
"summary": "Summarize session",
@@ -2820,10 +2827,10 @@
"in": "path",
"name": "sessionID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
- "required": true,
- "description": "Session ID"
+ "required": true
},
{
"in": "query",
@@ -2910,10 +2917,10 @@
"in": "path",
"name": "sessionID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
- "required": true,
- "description": "Session ID"
+ "required": true
}
],
"summary": "Send message",
@@ -3064,19 +3071,19 @@
"in": "path",
"name": "sessionID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
- "required": true,
- "description": "Session ID"
+ "required": true
},
{
"in": "path",
"name": "messageID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
- "required": true,
- "description": "Message ID"
+ "required": true
}
],
"summary": "Get message",
@@ -3153,19 +3160,19 @@
"in": "path",
"name": "sessionID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
- "required": true,
- "description": "Session ID"
+ "required": true
},
{
"in": "path",
"name": "messageID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
- "required": true,
- "description": "Message ID"
+ "required": true
}
],
"summary": "Delete message",
@@ -3232,28 +3239,28 @@
"in": "path",
"name": "sessionID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
- "required": true,
- "description": "Session ID"
+ "required": true
},
{
"in": "path",
"name": "messageID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
- "required": true,
- "description": "Message ID"
+ "required": true
},
{
"in": "path",
"name": "partID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
},
- "required": true,
- "description": "Part ID"
+ "required": true
}
],
"description": "Delete a part from a message",
@@ -3317,28 +3324,28 @@
"in": "path",
"name": "sessionID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
- "required": true,
- "description": "Session ID"
+ "required": true
},
{
"in": "path",
"name": "messageID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
- "required": true,
- "description": "Message ID"
+ "required": true
},
{
"in": "path",
"name": "partID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
},
- "required": true,
- "description": "Part ID"
+ "required": true
}
],
"description": "Update a part in a message",
@@ -3413,10 +3420,10 @@
"in": "path",
"name": "sessionID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
- "required": true,
- "description": "Session ID"
+ "required": true
}
],
"summary": "Send async message",
@@ -3548,10 +3555,10 @@
"in": "path",
"name": "sessionID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
- "required": true,
- "description": "Session ID"
+ "required": true
}
],
"summary": "Send command",
@@ -3633,7 +3640,8 @@
"type": "object",
"properties": {
"id": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
},
"type": {
"type": "string",
@@ -3693,10 +3701,10 @@
"in": "path",
"name": "sessionID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
- "required": true,
- "description": "Session ID"
+ "required": true
}
],
"summary": "Run shell command",
@@ -3793,7 +3801,8 @@
"in": "path",
"name": "sessionID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"required": true
}
@@ -3882,7 +3891,8 @@
"in": "path",
"name": "sessionID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"required": true
}
@@ -3951,7 +3961,8 @@
"in": "path",
"name": "sessionID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"required": true
},
@@ -3959,7 +3970,8 @@
"in": "path",
"name": "permissionID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^per.*"
},
"required": true
}
@@ -4045,7 +4057,8 @@
"in": "path",
"name": "requestID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^per.*"
},
"required": true
}
@@ -4221,7 +4234,8 @@
"in": "path",
"name": "requestID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^que.*"
},
"required": true
}
@@ -4309,7 +4323,8 @@
"in": "path",
"name": "requestID",
"schema": {
- "type": "string"
+ "type": "string",
+ "pattern": "^que.*"
},
"required": true
}
@@ -6306,7 +6321,7 @@
"sessionID": {
"description": "Session ID to navigate to",
"type": "string",
- "pattern": "^ses"
+ "pattern": "^ses.*"
}
},
"required": ["sessionID"]
@@ -7195,10 +7210,12 @@
"type": "object",
"properties": {
"id": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"role": {
"type": "string",
@@ -7435,10 +7452,12 @@
"type": "object",
"properties": {
"id": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"role": {
"type": "string",
@@ -7482,7 +7501,8 @@
]
},
"parentID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
"modelID": {
"type": "string"
@@ -7607,10 +7627,12 @@
"type": "object",
"properties": {
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"messageID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
}
},
"required": ["sessionID", "messageID"]
@@ -7622,13 +7644,16 @@
"type": "object",
"properties": {
"id": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
},
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"messageID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
"type": {
"type": "string",
@@ -7669,13 +7694,16 @@
"type": "object",
"properties": {
"id": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
},
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"messageID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
"type": {
"type": "string",
@@ -7712,13 +7740,16 @@
"type": "object",
"properties": {
"id": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
},
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"messageID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
"type": {
"type": "string",
@@ -7877,13 +7908,16 @@
"type": "object",
"properties": {
"id": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
},
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"messageID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
"type": {
"type": "string",
@@ -8070,13 +8104,16 @@
"type": "object",
"properties": {
"id": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
},
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"messageID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
"type": {
"type": "string",
@@ -8105,13 +8142,16 @@
"type": "object",
"properties": {
"id": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
},
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"messageID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
"type": {
"type": "string",
@@ -8127,13 +8167,16 @@
"type": "object",
"properties": {
"id": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
},
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"messageID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
"type": {
"type": "string",
@@ -8185,13 +8228,16 @@
"type": "object",
"properties": {
"id": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
},
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"messageID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
"type": {
"type": "string",
@@ -8207,13 +8253,16 @@
"type": "object",
"properties": {
"id": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
},
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"messageID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
"type": {
"type": "string",
@@ -8235,13 +8284,16 @@
"type": "object",
"properties": {
"id": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
},
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"messageID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
"type": {
"type": "string",
@@ -8276,13 +8328,16 @@
"type": "object",
"properties": {
"id": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
},
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"messageID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
"type": {
"type": "string",
@@ -8310,13 +8365,16 @@
"type": "object",
"properties": {
"id": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
},
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"messageID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
"type": {
"type": "string",
@@ -8401,13 +8459,16 @@
"type": "object",
"properties": {
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"messageID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
"partID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
},
"field": {
"type": "string"
@@ -8432,13 +8493,16 @@
"type": "object",
"properties": {
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"messageID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
"partID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
}
},
"required": ["sessionID", "messageID", "partID"]
@@ -8483,7 +8547,8 @@
"type": "object",
"properties": {
"messageID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
"callID": {
"type": "string"
@@ -8518,10 +8583,12 @@
"type": "object",
"properties": {
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"requestID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^per.*"
},
"reply": {
"type": "string",
@@ -8587,7 +8654,8 @@
"type": "object",
"properties": {
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"status": {
"$ref": "#/components/schemas/SessionStatus"
@@ -8609,7 +8677,8 @@
"type": "object",
"properties": {
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
}
},
"required": ["sessionID"]
@@ -8682,7 +8751,8 @@
"type": "object",
"properties": {
"messageID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
"callID": {
"type": "string"
@@ -8723,10 +8793,12 @@
"type": "object",
"properties": {
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"requestID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^que.*"
},
"answers": {
"type": "array",
@@ -8751,10 +8823,12 @@
"type": "object",
"properties": {
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"requestID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^que.*"
}
},
"required": ["sessionID", "requestID"]
@@ -8773,7 +8847,8 @@
"type": "object",
"properties": {
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
}
},
"required": ["sessionID"]
@@ -8845,7 +8920,8 @@
"type": "object",
"properties": {
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"todos": {
"type": "array",
@@ -8966,7 +9042,7 @@
"sessionID": {
"description": "Session ID to navigate to",
"type": "string",
- "pattern": "^ses"
+ "pattern": "^ses.*"
}
},
"required": ["sessionID"]
@@ -9084,7 +9160,8 @@
"type": "string"
},
"workspaceID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^wrk.*"
},
"directory": {
"type": "string"
@@ -9154,10 +9231,12 @@
"type": "object",
"properties": {
"messageID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
"partID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
},
"snapshot": {
"type": "string"
@@ -9239,7 +9318,8 @@
"type": "object",
"properties": {
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"diff": {
"type": "array",
@@ -9264,7 +9344,8 @@
"type": "object",
"properties": {
"sessionID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^ses.*"
},
"error": {
"anyOf": [
@@ -11169,7 +11250,8 @@
"type": "string"
},
"workspaceID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^wrk.*"
},
"directory": {
"type": "string"
@@ -11239,10 +11321,12 @@
"type": "object",
"properties": {
"messageID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^msg.*"
},
"partID": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
},
"snapshot": {
"type": "string"
@@ -11291,7 +11375,8 @@
"type": "object",
"properties": {
"id": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
},
"type": {
"type": "string",
@@ -11332,7 +11417,8 @@
"type": "object",
"properties": {
"id": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
},
"type": {
"type": "string",
@@ -11357,7 +11443,8 @@
"type": "object",
"properties": {
"id": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
},
"type": {
"type": "string",
@@ -11392,7 +11479,8 @@
"type": "object",
"properties": {
"id": {
- "type": "string"
+ "type": "string",
+ "pattern": "^prt.*"
},
"type": {
"type": "string",
diff --git a/packages/web/src/content/docs/go.mdx b/packages/web/src/content/docs/go.mdx
index 5976f1a35..d408b65b1 100644
--- a/packages/web/src/content/docs/go.mdx
+++ b/packages/web/src/content/docs/go.mdx
@@ -7,7 +7,7 @@ import config from "../../../config.mjs"
export const console = config.console
export const email = `mailto:${config.email}`
-OpenCode Go is a low cost **$10/month** subscription that gives you reliable access to popular open coding models.
+OpenCode Go is a low cost subscription — **$5 for your first month**, then **$10/month** — that gives you reliable access to popular open coding models.
:::note
OpenCode Go is currently in beta.
@@ -43,7 +43,7 @@ To fix this, we did a couple of things:
3. Finally, we benchmarked the combination of the model/provider and came up
with a list that we feel good recommending.
-OpenCode Go gives you access to these models for **$10/month**.
+OpenCode Go gives you access to these models for **$5 for your first month**, then **$10/month**.
---
diff --git a/packages/web/src/content/docs/zen.mdx b/packages/web/src/content/docs/zen.mdx
index 330f90014..ed2be57e7 100644
--- a/packages/web/src/content/docs/zen.mdx
+++ b/packages/web/src/content/docs/zen.mdx
@@ -62,43 +62,45 @@ You are charged per request and you can add credits to your account.
You can also access our models through the following API endpoints.
-| Model | Model ID | Endpoint | AI SDK Package |
-| ------------------- | ------------------- | -------------------------------------------------- | --------------------------- |
-| GPT 5.4 Pro | gpt-5.4-pro | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
-| GPT 5.4 | gpt-5.4 | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
-| GPT 5.3 Codex | gpt-5.3-codex | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
-| GPT 5.3 Codex Spark | gpt-5.3-codex-spark | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
-| GPT 5.2 | gpt-5.2 | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
-| GPT 5.2 Codex | gpt-5.2-codex | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
-| GPT 5.1 | gpt-5.1 | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
-| GPT 5.1 Codex | gpt-5.1-codex | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
-| GPT 5.1 Codex Max | gpt-5.1-codex-max | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
-| GPT 5.1 Codex Mini | gpt-5.1-codex-mini | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
-| GPT 5 | gpt-5 | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
-| GPT 5 Codex | gpt-5-codex | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
-| GPT 5 Nano | gpt-5-nano | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
-| Claude Opus 4.6 | claude-opus-4-6 | `https://opencode.ai/zen/v1/messages` | `@ai-sdk/anthropic` |
-| Claude Opus 4.5 | claude-opus-4-5 | `https://opencode.ai/zen/v1/messages` | `@ai-sdk/anthropic` |
-| Claude Opus 4.1 | claude-opus-4-1 | `https://opencode.ai/zen/v1/messages` | `@ai-sdk/anthropic` |
-| Claude Sonnet 4.6 | claude-sonnet-4-6 | `https://opencode.ai/zen/v1/messages` | `@ai-sdk/anthropic` |
-| Claude Sonnet 4.5 | claude-sonnet-4-5 | `https://opencode.ai/zen/v1/messages` | `@ai-sdk/anthropic` |
-| Claude Sonnet 4 | claude-sonnet-4 | `https://opencode.ai/zen/v1/messages` | `@ai-sdk/anthropic` |
-| Claude Haiku 4.5 | claude-haiku-4-5 | `https://opencode.ai/zen/v1/messages` | `@ai-sdk/anthropic` |
-| Claude Haiku 3.5 | claude-3-5-haiku | `https://opencode.ai/zen/v1/messages` | `@ai-sdk/anthropic` |
-| Gemini 3.1 Pro | gemini-3.1-pro | `https://opencode.ai/zen/v1/models/gemini-3.1-pro` | `@ai-sdk/google` |
-| Gemini 3 Pro | gemini-3-pro | `https://opencode.ai/zen/v1/models/gemini-3-pro` | `@ai-sdk/google` |
-| Gemini 3 Flash | gemini-3-flash | `https://opencode.ai/zen/v1/models/gemini-3-flash` | `@ai-sdk/google` |
-| MiniMax M2.5 | minimax-m2.5 | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
-| MiniMax M2.5 Free | minimax-m2.5-free | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
-| MiniMax M2.1 | minimax-m2.1 | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
-| GLM 5 | glm-5 | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
-| GLM 4.7 | glm-4.7 | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
-| GLM 4.6 | glm-4.6 | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
-| Kimi K2.5 | kimi-k2.5 | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
-| Kimi K2 Thinking | kimi-k2-thinking | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
-| Kimi K2 | kimi-k2 | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
-| Qwen3 Coder 480B | qwen3-coder | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
-| Big Pickle | big-pickle | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
+| Model | Model ID | Endpoint | AI SDK Package |
+| --------------------- | --------------------- | -------------------------------------------------- | --------------------------- |
+| GPT 5.4 Pro | gpt-5.4-pro | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
+| GPT 5.4 | gpt-5.4 | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
+| GPT 5.3 Codex | gpt-5.3-codex | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
+| GPT 5.3 Codex Spark | gpt-5.3-codex-spark | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
+| GPT 5.2 | gpt-5.2 | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
+| GPT 5.2 Codex | gpt-5.2-codex | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
+| GPT 5.1 | gpt-5.1 | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
+| GPT 5.1 Codex | gpt-5.1-codex | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
+| GPT 5.1 Codex Max | gpt-5.1-codex-max | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
+| GPT 5.1 Codex Mini | gpt-5.1-codex-mini | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
+| GPT 5 | gpt-5 | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
+| GPT 5 Codex | gpt-5-codex | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
+| GPT 5 Nano | gpt-5-nano | `https://opencode.ai/zen/v1/responses` | `@ai-sdk/openai` |
+| Claude Opus 4.6 | claude-opus-4-6 | `https://opencode.ai/zen/v1/messages` | `@ai-sdk/anthropic` |
+| Claude Opus 4.5 | claude-opus-4-5 | `https://opencode.ai/zen/v1/messages` | `@ai-sdk/anthropic` |
+| Claude Opus 4.1 | claude-opus-4-1 | `https://opencode.ai/zen/v1/messages` | `@ai-sdk/anthropic` |
+| Claude Sonnet 4.6 | claude-sonnet-4-6 | `https://opencode.ai/zen/v1/messages` | `@ai-sdk/anthropic` |
+| Claude Sonnet 4.5 | claude-sonnet-4-5 | `https://opencode.ai/zen/v1/messages` | `@ai-sdk/anthropic` |
+| Claude Sonnet 4 | claude-sonnet-4 | `https://opencode.ai/zen/v1/messages` | `@ai-sdk/anthropic` |
+| Claude Haiku 4.5 | claude-haiku-4-5 | `https://opencode.ai/zen/v1/messages` | `@ai-sdk/anthropic` |
+| Claude Haiku 3.5 | claude-3-5-haiku | `https://opencode.ai/zen/v1/messages` | `@ai-sdk/anthropic` |
+| Gemini 3.1 Pro | gemini-3.1-pro | `https://opencode.ai/zen/v1/models/gemini-3.1-pro` | `@ai-sdk/google` |
+| Gemini 3 Pro | gemini-3-pro | `https://opencode.ai/zen/v1/models/gemini-3-pro` | `@ai-sdk/google` |
+| Gemini 3 Flash | gemini-3-flash | `https://opencode.ai/zen/v1/models/gemini-3-flash` | `@ai-sdk/google` |
+| MiniMax M2.5 | minimax-m2.5 | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
+| MiniMax M2.5 Free | minimax-m2.5-free | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
+| MiniMax M2.1 | minimax-m2.1 | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
+| GLM 5 | glm-5 | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
+| GLM 4.7 | glm-4.7 | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
+| GLM 4.6 | glm-4.6 | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
+| Kimi K2.5 | kimi-k2.5 | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
+| Kimi K2 Thinking | kimi-k2-thinking | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
+| Kimi K2 | kimi-k2 | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
+| Qwen3 Coder 480B | qwen3-coder | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
+| Big Pickle | big-pickle | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
+| MiMo V2 Flash Free | mimo-v2-flash-free | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
+| Nemotron 3 Super Free | nemotron-3-super-free | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
The [model id](/docs/config/#models) in your OpenCode config
uses the format `opencode/`. For example, for GPT 5.3 Codex, you would
@@ -123,6 +125,8 @@ We support a pay-as-you-go model. Below are the prices **per 1M tokens**.
| Model | Input | Output | Cached Read | Cached Write |
| --------------------------------- | ------ | ------- | ----------- | ------------ |
| Big Pickle | Free | Free | Free | - |
+| MiMo V2 Flash Free | Free | Free | Free | - |
+| Nemotron 3 Super Free | Free | Free | Free | - |
| MiniMax M2.5 Free | Free | Free | Free | - |
| MiniMax M2.5 | $0.30 | $1.20 | $0.06 | $0.375 |
| MiniMax M2.1 | $0.30 | $1.20 | $0.10 | - |
@@ -173,6 +177,8 @@ Credit card fees are passed along at cost (4.4% + $0.30 per transaction); we don
The free models:
- MiniMax M2.5 Free is available on OpenCode for a limited time. The team is using this time to collect feedback and improve the model.
+- MiMo V2 Flash Free is available on OpenCode for a limited time. The team is using this time to collect feedback and improve the model.
+- Nemotron 3 Super Free is available on OpenCode for a limited time. The team is using this time to collect feedback and improve the model.
- Big Pickle is a stealth model that's free on OpenCode for a limited time. The team is using this time to collect feedback and improve the model.
Contact us if you have any questions.
@@ -217,6 +223,8 @@ All our models are hosted in the US. Our providers follow a zero-retention polic
- Big Pickle: During its free period, collected data may be used to improve the model.
- MiniMax M2.5 Free: During its free period, collected data may be used to improve the model.
+- MiniMax M2.5 Free: During its free period, collected data may be used to improve the model.
+- Nemotron 3 Super Free: During its free period, collected data may be used to improve the model.
- OpenAI APIs: Requests are retained for 30 days in accordance with [OpenAI's Data Policies](https://platform.openai.com/docs/guides/your-data).
- Anthropic APIs: Requests are retained for 30 days in accordance with [Anthropic's Data Policies](https://docs.anthropic.com/en/docs/claude-code/data-usage).
diff --git a/sst-env.d.ts b/sst-env.d.ts
index c8622a5a9..48478d4e5 100644
--- a/sst-env.d.ts
+++ b/sst-env.d.ts
@@ -157,6 +157,7 @@ declare module "sst" {
"value": string
}
"ZEN_LITE_PRICE": {
+ "firstMonth50Coupon": string
"price": string
"product": string
"type": "sst.sst.Linkable"