@llm4ts/core 3.3.0 → 4.0.0

package/dist/providers/ClaudeAgentSession.js

@@ -1,161 +0,0 @@
-import * as Deferred from "effect/Deferred";
-import * as Effect from "effect/Effect";
-import * as PubSub from "effect/PubSub";
-import * as Queue from "effect/Queue";
-import * as Ref from "effect/Ref";
-import * as Stream from "effect/Stream";
-import { SessionDone, SessionResult, SessionTextDelta, SessionToolResult, SessionToolUse, SessionUsage } from "../AgentSession.js";
-import { ProviderError } from "../Errors.js";
-import { TokenUsage } from "../Models.js";
-import { jsonArray, jsonBooleanField, jsonField, jsonIntField, jsonNumberField, jsonStringField, jsonText, parseJsonLine } from "./CliSupport.js";
-export const claudeSessionArgv = (model, extraFlags) => [
-    "claude",
-    "--print",
-    "--input-format",
-    "stream-json",
-    "--output-format",
-    "stream-json",
-    "--verbose",
-    ...(model === undefined ? [] : ["--model", model]),
-    ...extraFlags
-];
-export const claudeUserMessageJson = (text) => JSON.stringify({
-    type: "user",
-    message: {
-        role: "user",
-        content: text
-    }
-});
-const contentBlocks = (json) => jsonArray(jsonField(jsonField(json, "message"), "content"));
-const assistantEvents = (json) => contentBlocks(json).flatMap((block) => {
-    switch (jsonStringField(block, "type")) {
-        case "text": {
-            const text = jsonStringField(block, "text");
-            return text === undefined || text.length === 0 ? [] : [SessionTextDelta.make({ text })];
-        }
-        case "tool_use":
-            return [
-                SessionToolUse.make({
-                    tool: jsonStringField(block, "name") ?? "",
-                    rawInput: jsonText(jsonField(block, "input") ?? {}),
-                    id: jsonStringField(block, "id") ?? ""
-                })
-            ];
-        default:
-            return [];
-    }
-});
-const toolResultEvents = (json) => contentBlocks(json).flatMap((block) => {
-    if (jsonStringField(block, "type") !== "tool_result") {
-        return [];
-    }
-    const content = jsonField(block, "content");
-    return [
-        SessionToolResult.make({
-            id: jsonStringField(block, "tool_use_id") ?? "",
-            status: jsonBooleanField(block, "is_error") === true ? "error" : "success",
-            content: content === undefined ? "" : jsonText(content)
-        })
-    ];
-});
-const resultEvents = (json) => {
-    const usage = jsonField(json, "usage");
-    const usageEvents = usage === undefined
-        ? []
-        : [
-            SessionUsage.make({
-                usage: TokenUsage.make({
-                    prompt: jsonIntField(usage, "input_tokens") ?? 0,
-                    completion: jsonIntField(usage, "output_tokens") ?? 0,
-                    total: (jsonIntField(usage, "input_tokens") ?? 0) +
-                        (jsonIntField(usage, "output_tokens") ?? 0),
-                    ...(jsonIntField(usage, "cache_read_input_tokens") === undefined
-                        ? {}
-                        : {
-                            cached: jsonIntField(usage, "cache_read_input_tokens") ?? 0
-                        }),
-                    ...(jsonNumberField(json, "total_cost_usd") === undefined
-                        ? {}
-                        : { costUsd: jsonNumberField(json, "total_cost_usd") ?? 0 })
-                })
-            })
-        ];
-    return [
-        ...usageEvents,
-        SessionDone.make({
-            result: jsonStringField(json, "result") ?? ""
-        })
-    ];
-};
-export const parseClaudeSessionLine = (line) => {
-    const json = parseJsonLine(line);
-    if (json === undefined) {
-        return [];
-    }
-    switch (jsonStringField(json, "type")) {
-        case "assistant":
-            return assistantEvents(json);
-        case "user":
-            return toolResultEvents(json);
-        case "result":
-            return resultEvents(json);
-        default:
-            return [];
-    }
-};
-export const claudeSessionInitModel = (line) => {
-    const json = parseJsonLine(line);
-    return json !== undefined && jsonStringField(json, "type") === "system"
-        ? jsonStringField(json, "model")
-        : undefined;
-};
-export const openClaudeAgentSession = Effect.fn("@llm4ts/core/providers/ClaudeAgentSession.open")(function* (executor, argv, cwd, envVars = {}) {
-    const [stdin, stdout] = yield* executor.runBidirectional(argv, cwd, envVars);
-    const events = yield* PubSub.unbounded();
-    const done = yield* Deferred.make();
-    const model = yield* Ref.make(undefined);
-    const text = yield* Ref.make("");
-    const usage = yield* Ref.make(undefined);
-    const trackEvent = Effect.fn("@llm4ts/core/providers/ClaudeAgentSession.trackEvent")(function* (event) {
-        switch (event._tag) {
-            case "TextDelta":
-                yield* Ref.update(text, (current) => current + event.text);
-                break;
-            case "Usage":
-                yield* Ref.set(usage, event.usage);
-                break;
-            case "Done": {
-                const accumulated = yield* Ref.get(text);
-                const finalUsage = yield* Ref.get(usage);
-                const finalModel = yield* Ref.get(model);
-                yield* Deferred.succeed(done, SessionResult.make({
-                    text: event.result.length === 0 ? accumulated : event.result,
-                    ...(finalUsage === undefined ? {} : { usage: finalUsage }),
-                    ...(finalModel === undefined ? {} : { model: finalModel })
-                }));
-                break;
-            }
-            default:
-                break;
-        }
-        yield* PubSub.publish(events, event);
-    });
-    yield* stdout.pipe(Stream.mapEffect((line) => {
-        const initializedModel = claudeSessionInitModel(line);
-        return initializedModel === undefined
-            ? Effect.succeed(line)
-            : Ref.set(model, initializedModel).pipe(Effect.as(line));
-    }), Stream.flatMap((line) => Stream.fromIterable(parseClaudeSessionLine(line))), Stream.mapEffect(trackEvent), Stream.runDrain, Effect.catch((error) => Deferred.fail(done, error).pipe(Effect.asVoid)), Effect.ensuring(Deferred.fail(done, ProviderError.make({
-        message: "claude session ended before a result"
-    })).pipe(Effect.asVoid)), Effect.forkScoped);
-    const sendUserMessage = (message) => Queue.offer(stdin, claudeUserMessageJson(message)).pipe(Effect.asVoid);
-    return {
-        events: Stream.fromPubSub(events),
-        sendUserMessage,
-        respondToAsk: sendUserMessage,
-        respondToApproval: (_id, _approved) => Effect.void,
-        awaitResult: Deferred.await(done),
-        cancel: Queue.shutdown(stdin)
-    };
-});
-//# sourceMappingURL=ClaudeAgentSession.js.map

package/dist/providers/ClaudeAgentSession.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ClaudeAgentSession.js","sourceRoot":"","sources":["../../src/providers/ClaudeAgentSession.ts"],"names":[],"mappings":"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"}

package/src/AgentSession.ts

@@ -1,69 +0,0 @@
-import type * as Effect from "effect/Effect"
-import * as Schema from "effect/Schema"
-import type * as Stream from "effect/Stream"
-import type { LlmError } from "./Errors.ts"
-import { TokenUsage } from "./Models.ts"
-
-export class SessionTextDelta extends Schema.TaggedClass<SessionTextDelta>()("TextDelta", {
-  text: Schema.String
-}) {}
-
-export class SessionToolUse extends Schema.TaggedClass<SessionToolUse>()("ToolUse", {
-  tool: Schema.String,
-  rawInput: Schema.String,
-  id: Schema.String
-}) {}
-
-export class SessionToolResult extends Schema.TaggedClass<SessionToolResult>()("ToolResult", {
-  id: Schema.String,
-  status: Schema.String,
-  content: Schema.String
-}) {}
-
-export class SessionAskUser extends Schema.TaggedClass<SessionAskUser>()("AskUser", {
-  question: Schema.String
-}) {}
-
-export class SessionApprovalRequest extends Schema.TaggedClass<SessionApprovalRequest>()(
-  "ApprovalRequest",
-  {
-    tool: Schema.String,
-    rawInput: Schema.String,
-    id: Schema.String
-  }
-) {}
-
-export class SessionUsage extends Schema.TaggedClass<SessionUsage>()("Usage", {
-  usage: TokenUsage,
-  model: Schema.optionalKey(Schema.String)
-}) {}
-
-export class SessionDone extends Schema.TaggedClass<SessionDone>()("Done", {
-  result: Schema.String
-}) {}
-
-export const SessionEvent = Schema.Union([
-  SessionTextDelta,
-  SessionToolUse,
-  SessionToolResult,
-  SessionAskUser,
-  SessionApprovalRequest,
-  SessionUsage,
-  SessionDone
-])
-export type SessionEvent = typeof SessionEvent.Type
-
-export class SessionResult extends Schema.Class<SessionResult>("SessionResult")({
-  text: Schema.String,
-  usage: Schema.optionalKey(TokenUsage),
-  model: Schema.optionalKey(Schema.String)
-}) {}
-
-export interface AgentSessionShape {
-  readonly events: Stream.Stream<SessionEvent, LlmError>
-  readonly sendUserMessage: (text: string) => Effect.Effect<void, LlmError>
-  readonly respondToAsk: (answer: string) => Effect.Effect<void, LlmError>
-  readonly respondToApproval: (id: string, approved: boolean) => Effect.Effect<void, LlmError>
-  readonly awaitResult: Effect.Effect<SessionResult, LlmError>
-  readonly cancel: Effect.Effect<void>
-}

package/src/providers/ClaudeAgentSession.ts

@@ -1,230 +0,0 @@
-import * as Deferred from "effect/Deferred"
-import * as Effect from "effect/Effect"
-import * as PubSub from "effect/PubSub"
-import * as Queue from "effect/Queue"
-import * as Ref from "effect/Ref"
-import type * as Scope from "effect/Scope"
-import * as Stream from "effect/Stream"
-import {
-  SessionDone,
-  SessionResult,
-  SessionTextDelta,
-  SessionToolResult,
-  SessionToolUse,
-  SessionUsage,
-  type AgentSessionShape,
-  type SessionEvent
-} from "../AgentSession.ts"
-import { ProviderError, type LlmError } from "../Errors.ts"
-import { TokenUsage } from "../Models.ts"
-import type { ProcessExecutorShape } from "../ProcessExecutor.ts"
-import {
-  jsonArray,
-  jsonBooleanField,
-  jsonField,
-  jsonIntField,
-  jsonNumberField,
-  jsonStringField,
-  jsonText,
-  parseJsonLine,
-  type JsonValue
-} from "./CliSupport.ts"
-
-export const claudeSessionArgv = (
-  model: string | undefined,
-  extraFlags: ReadonlyArray<string>
-): ReadonlyArray<string> => [
-  "claude",
-  "--print",
-  "--input-format",
-  "stream-json",
-  "--output-format",
-  "stream-json",
-  "--verbose",
-  ...(model === undefined ? [] : ["--model", model]),
-  ...extraFlags
-]
-
-export const claudeUserMessageJson = (text: string): string =>
-  JSON.stringify({
-    type: "user",
-    message: {
-      role: "user",
-      content: text
-    }
-  })
-
-const contentBlocks = (json: JsonValue): ReadonlyArray<JsonValue> =>
-  jsonArray(jsonField(jsonField(json, "message"), "content"))
-
-const assistantEvents = (json: JsonValue): ReadonlyArray<SessionEvent> =>
-  contentBlocks(json).flatMap((block): ReadonlyArray<SessionEvent> => {
-    switch (jsonStringField(block, "type")) {
-      case "text": {
-        const text = jsonStringField(block, "text")
-        return text === undefined || text.length === 0 ? [] : [SessionTextDelta.make({ text })]
-      }
-      case "tool_use":
-        return [
-          SessionToolUse.make({
-            tool: jsonStringField(block, "name") ?? "",
-            rawInput: jsonText(jsonField(block, "input") ?? {}),
-            id: jsonStringField(block, "id") ?? ""
-          })
-        ]
-      default:
-        return []
-    }
-  })
-
-const toolResultEvents = (json: JsonValue): ReadonlyArray<SessionEvent> =>
-  contentBlocks(json).flatMap((block): ReadonlyArray<SessionEvent> => {
-    if (jsonStringField(block, "type") !== "tool_result") {
-      return []
-    }
-    const content = jsonField(block, "content")
-    return [
-      SessionToolResult.make({
-        id: jsonStringField(block, "tool_use_id") ?? "",
-        status: jsonBooleanField(block, "is_error") === true ? "error" : "success",
-        content: content === undefined ? "" : jsonText(content)
-      })
-    ]
-  })
-
-const resultEvents = (json: JsonValue): ReadonlyArray<SessionEvent> => {
-  const usage = jsonField(json, "usage")
-  const usageEvents: ReadonlyArray<SessionEvent> =
-    usage === undefined
-      ? []
-      : [
-          SessionUsage.make({
-            usage: TokenUsage.make({
-              prompt: jsonIntField(usage, "input_tokens") ?? 0,
-              completion: jsonIntField(usage, "output_tokens") ?? 0,
-              total:
-                (jsonIntField(usage, "input_tokens") ?? 0) +
-                (jsonIntField(usage, "output_tokens") ?? 0),
-              ...(jsonIntField(usage, "cache_read_input_tokens") === undefined
-                ? {}
-                : {
-                    cached: jsonIntField(usage, "cache_read_input_tokens") ?? 0
-                  }),
-              ...(jsonNumberField(json, "total_cost_usd") === undefined
-                ? {}
-                : { costUsd: jsonNumberField(json, "total_cost_usd") ?? 0 })
-            })
-          })
-        ]
-
-  return [
-    ...usageEvents,
-    SessionDone.make({
-      result: jsonStringField(json, "result") ?? ""
-    })
-  ]
-}
-
-export const parseClaudeSessionLine = (line: string): ReadonlyArray<SessionEvent> => {
-  const json = parseJsonLine(line)
-  if (json === undefined) {
-    return []
-  }
-  switch (jsonStringField(json, "type")) {
-    case "assistant":
-      return assistantEvents(json)
-    case "user":
-      return toolResultEvents(json)
-    case "result":
-      return resultEvents(json)
-    default:
-      return []
-  }
-}
-
-export const claudeSessionInitModel = (line: string): string | undefined => {
-  const json = parseJsonLine(line)
-  return json !== undefined && jsonStringField(json, "type") === "system"
-    ? jsonStringField(json, "model")
-    : undefined
-}
-
-export const openClaudeAgentSession = Effect.fn("@llm4ts/core/providers/ClaudeAgentSession.open")(
-  function* (
-    executor: ProcessExecutorShape,
-    argv: ReadonlyArray<string>,
-    cwd: string,
-    envVars: Readonly<Record<string, string>> = {}
-  ): Effect.fn.Return<AgentSessionShape, LlmError, Scope.Scope> {
-    const [stdin, stdout] = yield* executor.runBidirectional(argv, cwd, envVars)
-    const events = yield* PubSub.unbounded<SessionEvent>()
-    const done = yield* Deferred.make<SessionResult, LlmError>()
-    const model = yield* Ref.make<string | undefined>(undefined)
-    const text = yield* Ref.make("")
-    const usage = yield* Ref.make<TokenUsage | undefined>(undefined)
-
-    const trackEvent = Effect.fn("@llm4ts/core/providers/ClaudeAgentSession.trackEvent")(function* (
-      event: SessionEvent
-    ) {
-      switch (event._tag) {
-        case "TextDelta":
-          yield* Ref.update(text, (current) => current + event.text)
-          break
-        case "Usage":
-          yield* Ref.set(usage, event.usage)
-          break
-        case "Done": {
-          const accumulated = yield* Ref.get(text)
-          const finalUsage = yield* Ref.get(usage)
-          const finalModel = yield* Ref.get(model)
-          yield* Deferred.succeed(
-            done,
-            SessionResult.make({
-              text: event.result.length === 0 ? accumulated : event.result,
-              ...(finalUsage === undefined ? {} : { usage: finalUsage }),
-              ...(finalModel === undefined ? {} : { model: finalModel })
-            })
-          )
-          break
-        }
-        default:
-          break
-      }
-      yield* PubSub.publish(events, event)
-    })
-
-    yield* stdout.pipe(
-      Stream.mapEffect((line) => {
-        const initializedModel = claudeSessionInitModel(line)
-        return initializedModel === undefined
-          ? Effect.succeed(line)
-          : Ref.set(model, initializedModel).pipe(Effect.as(line))
-      }),
-      Stream.flatMap((line) => Stream.fromIterable(parseClaudeSessionLine(line))),
-      Stream.mapEffect(trackEvent),
-      Stream.runDrain,
-      Effect.catch((error) => Deferred.fail(done, error).pipe(Effect.asVoid)),
-      Effect.ensuring(
-        Deferred.fail(
-          done,
-          ProviderError.make({
-            message: "claude session ended before a result"
-          })
-        ).pipe(Effect.asVoid)
-      ),
-      Effect.forkScoped
-    )
-
-    const sendUserMessage = (message: string): Effect.Effect<void, LlmError> =>
-      Queue.offer(stdin, claudeUserMessageJson(message)).pipe(Effect.asVoid)
-
-    return {
-      events: Stream.fromPubSub(events),
-      sendUserMessage,
-      respondToAsk: sendUserMessage,
-      respondToApproval: (_id, _approved) => Effect.void,
-      awaitResult: Deferred.await(done),
-      cancel: Queue.shutdown(stdin)
-    }
-  }
-)