clanka 0.2.71 → 0.3.0

package/src/DeviceCodeHandler.ts

@@ -1,5 +1,5 @@
 import * as Console from "effect/Console"
-import type * as Effect from "effect/Effect"
+import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
 import * as Context from "effect/Context"
 
@@ -19,3 +19,10 @@ export const layerConsole = Layer.succeed(DeviceCodeHandler, {
       `Open ${options.verifyUrl} and enter code ${options.deviceCode}.`,
     ),
 })
+
+export const layerLog = Layer.succeed(DeviceCodeHandler, {
+  onCode: (options) =>
+    Effect.logWarning(
+      `Open ${options.verifyUrl} and enter code ${options.deviceCode}.`,
+    ),
+})

package/src/ExaSearch.ts

@@ -42,7 +42,7 @@ class ExaSearchResult extends Schema.Class<ExaSearchResult>("ExaSearchResult")({
  * @since 1.0.0
  * @category Errors
  */
-export class ExaError extends Schema.TaggedErrorClass<ExaError>()("ExaError", {
+export class ExaError extends Schema.TaggedError<ExaError>()("ExaError", {
   cause: Schema.Defect(),
 }) {}
 

package/src/McpClient.ts

@@ -30,7 +30,7 @@ export class McpClient extends Context.Service<
  * @since 1.0.0
  * @category Errors
  */
-export class McpClientError extends Schema.TaggedErrorClass<McpClientError>()(
+export class McpClientError extends Schema.TaggedError<McpClientError>()(
   "McpClientError",
   {
     cause: Schema.Defect(),

package/src/SemanticSearch.ts

@@ -41,12 +41,12 @@ const resolveChunkConfig = (options: {
 })
 
 export const makeEmbeddingResolver = (
-  resolver: EmbeddingModel.Service["resolver"],
+  resolver: EmbeddingModel.EmbeddingModel["resolver"],
   options: {
     readonly embeddingBatchSize?: number | undefined
     readonly embeddingRequestDelay?: Duration.Input | undefined
   },
-): EmbeddingModel.Service["resolver"] =>
+): EmbeddingModel.EmbeddingModel["resolver"] =>
   resolver.pipe(
     RequestResolver.setDelay(
       options.embeddingRequestDelay ?? Duration.millis(50),

package/src/TypeBuilder.ts

@@ -440,7 +440,7 @@ const stripOptionalTupleUndefined = (ast: AST.AST): AST.AST => {
     ? definedType
     : new AST.Union(
         definedTypes,
-        ast.mode,
+        ast.options,
         ast.annotations,
         ast.checks,
         ast.encoding,

package/src/cli.ts

@@ -7,6 +7,8 @@ import * as Flag from "effect/unstable/cli/Flag"
 import * as NodeServices from "@effect/platform-node/NodeServices"
 import * as NodeRuntime from "@effect/platform-node/NodeRuntime"
 import * as NodeSocket from "@effect/platform-node/NodeSocket"
+import * as Acp from "./Acp.ts"
+import * as AgentExecutor from "./AgentExecutor.ts"
 import * as Codex from "./Codex.ts"
 import * as Copilot from "./Copilot.ts"
 import * as Agent from "./Agent.ts"
@@ -15,17 +17,65 @@ import * as OutputFormatter from "./OutputFormatter.ts"
 import * as Stdio from "effect/Stdio"
 import { pipe } from "effect/Function"
 import * as Layer from "effect/Layer"
+import * as Logger from "effect/Logger"
 import * as Path from "effect/Path"
+import * as Schema from "effect/Schema"
+import type * as LanguageModel from "effect/unstable/ai/LanguageModel"
+import type * as Model from "effect/unstable/ai/Model"
 import * as Config from "effect/Config"
 import * as KeyValueStore from "effect/unstable/persistence/KeyValueStore"
 import * as Option from "effect/Option"
 import { OpenAiClient, OpenAiEmbeddingModel } from "@effect/ai-openai"
 import { DeviceCodeHandler } from "./index.ts"
 
-const provider = Flag.choice("provider", ["openai", "copilot"]).pipe(
+const version = "0.0.1"
+
+type Provider = "openai" | "copilot"
+
+const providers: ReadonlyArray<Provider> = ["openai", "copilot"]
+
+const withSubagentModel = <E, R>(
+  model: Layer.Layer<
+    LanguageModel.LanguageModel | Model.ProviderName | Model.ModelName,
+    E,
+    R
+  >,
+) => Layer.merge(model, Agent.layerSubagentModel(model))
+
+const modelLayer = (provider: Provider, model: string, effort: string) =>
+  provider === "openai"
+    ? withSubagentModel(
+        Codex.modelWebSocket(model, { reasoning: { effort: effort as any } }),
+      ).pipe(Layer.provide(Codex.layerClient))
+    : withSubagentModel(Copilot.model(model, { reasoning: { effort } })).pipe(
+        Layer.provide(Copilot.layerClient),
+      )
+
+const parseModelId = (modelId: string) => {
+  const [provider, model, effort, ...rest] = modelId.split("/")
+  return provider !== undefined &&
+    providers.includes(provider as Provider) &&
+    model !== undefined &&
+    effort !== undefined &&
+    rest.length === 0
+    ? Option.some({ provider: provider as Provider, model, effort })
+    : Option.none()
+}
+
+const ModelId = Schema.String.pipe(
+  Schema.check(
+    Schema.makeFilter(
+      (modelId: string) =>
+        Option.isSome(parseModelId(modelId)) ||
+        `Invalid model "${modelId}", expected <provider>/<model>/<effort>`,
+    ),
+  ),
+)
+
+const provider = Flag.Literals("provider", providers).pipe(
   Flag.withAlias("p"),
   Flag.withFallbackPrompt(
-    Prompt.select({
+    Prompt.Select({
       message: "Select a provider",
       choices: [
         {
@@ -42,12 +92,12 @@ const provider = Flag.choice("provider", ["openai", "copilot"]).pipe(
   ),
 )
 
-const model = Flag.string("model").pipe(
+const model = Flag.String("model").pipe(
   Flag.withAlias("m"),
   Flag.withFallbackPrompt(
-    Prompt.text({
+    Prompt.String({
       message: "Enter a model",
-      default: "gpt-5.4/medium",
+      default: "gpt-6-astra/medium",
       validate(value) {
         const parts = value.split("/")
         if (parts.length !== 2) {
@@ -59,7 +109,7 @@ const model = Flag.string("model").pipe(
   ),
 )
 
-const semantic = Flag.directory("search").pipe(
+const semantic = Flag.Directory("search").pipe(
   Flag.withDescription(
     "Directory for semantic search data (uses OPENAI_API_KEY env var)",
   ),
@@ -67,7 +117,7 @@ const semantic = Flag.directory("search").pipe(
   Flag.optional,
 )
 
-const prompt = Flag.string("prompt").pipe(
+const prompt = Flag.String("prompt").pipe(
   Flag.withDescription("Pass a prompt in non-interactive mode"),
   Flag.optional,
 )
@@ -76,9 +126,9 @@ const Kvs = Layer.unwrap(
   Effect.gen(function* () {
     const path = yield* Path.Path
 
-    const configHome = yield* Config.nonEmptyString("XDG_CONFIG_HOME").pipe(
+    const configHome = yield* Config.NonEmptyString("XDG_CONFIG_HOME").pipe(
       Config.orElse(() =>
-        Config.nonEmptyString("HOME").pipe(
+        Config.NonEmptyString("HOME").pipe(
           Config.map((home) => path.join(home, ".config")),
         ),
       ),
@@ -90,7 +140,7 @@ const Kvs = Layer.unwrap(
 const Search = (directory: string) =>
   Layer.unwrap(
     Effect.gen(function* () {
-      const apiKey = yield* Config.redacted("OPENAI_API_KEY").pipe(
+      const apiKey = yield* Config.Redacted("OPENAI_API_KEY").pipe(
         Config.option,
       )
 
@@ -123,6 +173,42 @@ const Search = (directory: string) =>
     }),
   ).pipe(Layer.provide([NodeServices.layer, NodeHttpClient.layerUndici]))
 
+const acpModel = Flag.String("model").pipe(
+  Flag.withAlias("m"),
+  Flag.withDescription(
+    "Default model as <provider>/<model>/<effort>, e.g. openai/gpt-6-astra/medium",
+  ),
+  Flag.withSchema(ModelId),
+  Flag.withDefault("openai/gpt-6-astra/medium"),
+)
+
+const acp = Command.make("acp", { model: acpModel }).pipe(
+  Command.withDescription(
+    "Run as an Agent Client Protocol (ACP) server over stdio",
+  ),
+  Command.withHandler(({ model }) =>
+    Acp.runStdio({
+      version,
+      defaultModel: model,
+      makeAgent: (cwd) =>
+        Agent.make.pipe(
+          Effect.provide(AgentExecutor.layerLocal({ directory: cwd })),
+        ),
+      makeModel: (modelId) =>
+        Option.map(parseModelId(modelId), ({ provider, model, effort }) =>
+          modelLayer(provider, model, effort),
+        ),
+    }),
+  ),
+  Command.provide(
+    Layer.mergeAll(
+      Agent.ConversationMode.layer(true),
+      Layer.succeed(Logger.LogToStderr, true),
+      DeviceCodeHandler.layerLog,
+    ),
+  ),
+)
+
 Command.make("clanka", { provider, model, semantic, prompt }).pipe(
   Command.withHandler(
     Effect.fnUntraced(function* ({
@@ -133,40 +219,7 @@ Command.make("clanka", { provider, model, semantic, prompt }).pipe(
     }) {
       const stdio = yield* Stdio.Stdio
       const [model, reasoning] = modelRaw.split("/") as [string, string]
-      const Model =
-        provider === "openai"
-          ? Codex.modelWebSocket(model, {
-              reasoning: {
-                effort: reasoning as any,
-              },
-            }).pipe(
-              Layer.merge(
-                Agent.layerSubagentModel(
-                  Codex.modelWebSocket("gpt-5.4-mini", {
-                    reasoning: {
-                      effort: "high",
-                    },
-                  }),
-                ),
-              ),
-              Layer.provide(Codex.layerClient),
-            )
-          : Copilot.model(model, {
-              reasoning: {
-                effort: reasoning,
-              },
-            }).pipe(
-              Layer.merge(
-                Agent.layerSubagentModel(
-                  Copilot.model(model, {
-                    reasoning: {
-                      effort: "medium",
-                    },
-                  }),
-                ),
-              ),
-              Layer.provide(Copilot.layerClient),
-            )
+      const Model = modelLayer(provider, model, reasoning)
 
       return yield* Effect.gen(function* () {
         const agent = yield* Agent.Agent
@@ -181,7 +234,7 @@ Command.make("clanka", { provider, model, semantic, prompt }).pipe(
         }
 
         while (true) {
-          const prompt = yield* Prompt.text({
+          const prompt = yield* Prompt.String({
             message: ">",
           })
 
@@ -214,8 +267,9 @@ Command.make("clanka", { provider, model, semantic, prompt }).pipe(
   Command.provide(({ prompt }) =>
     Agent.ConversationMode.layer(Option.isNone(prompt)),
   ),
+  Command.withSubcommands([acp]),
   Command.run({
-    version: "0.0.1",
+    version,
   }),
   Effect.provide([
     NodeServices.layer,

package/src/index.ts

@@ -1,3 +1,8 @@
+/**
+ * @since 1.0.0
+ */
+export * as Acp from "./Acp.ts"
+
 /**
  * @since 1.0.0
  */