@moltzap/client 2026.520.2 → 2026.524.0

package/dist/cli/commands/conversations.d.ts

@@ -1,78 +1,30 @@
+/**
+ * D3 cutover: only `history` survives; legacy list/create/archive/etc.
+ * subcommands ship in the D3 ADD slice once typed `Task*` CLI helpers
+ * land at the transport boundary.
+ */
 import { Command } from "@effect/cli";
-import { Effect, Option } from "effect";
-import { type Transport, type TransportError } from "../transport.js";
-/** Discriminated error union for the three v2 conversation subcommands. */
-export type ConversationsCommandError = TransportError | ConversationsInputError;
-declare const ConversationsInputError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
-    readonly _tag: "ConversationsInputError";
-} & Readonly<A>;
-/** CLI-level input was rejected (architect stage: signature only). */
-declare class ConversationsInputError extends ConversationsInputError_base<{
-    readonly message: string;
-    readonly reason: string;
-}> {
-}
-/** `moltzap conversations get &lt;id>` → conversations/get; prints { conversation, participants }. */
-export declare const conversationsGetHandler: (args: {
-    readonly conversationId: string;
-}) => Effect.Effect<void, ConversationsCommandError, Transport>;
-/** `moltzap conversations archive &lt;id>` → conversations/archive; prints success marker. */
-export declare const conversationsArchiveHandler: (args: {
-    readonly conversationId: string;
-}) => Effect.Effect<void, ConversationsCommandError, Transport>;
-/** `moltzap conversations unarchive &lt;id>` → conversations/unarchive; prints success marker. */
-export declare const conversationsUnarchiveHandler: (args: {
-    readonly conversationId: string;
-}) => Effect.Effect<void, ConversationsCommandError, Transport>;
+import { Option } from "effect";
 /**
- * `moltzap conversations [list|create|leave|mute|unmute|update|add-participant|remove-participant|history|get|archive|unarchive]`
- * — conversation CRUD + inspection over the local Unix socket. Default (no
- * subcommand) lists. The `get`, `archive`, `unarchive` subcommands are
- * wired by impl-staff against the handlers above (sbd#185).
+ * `moltzap conversations [history]` — the legacy CRUD subcommands
+ * retire with the `Conversations*` wire surface; restructure to
+ * `Task*` / `TaskConversation*` ships in the D3 ADD slice.
  */
-export declare const conversationsCommand: Command.Command<"conversations", Transport, never, {
+export declare const conversationsCommand: Command.Command<"conversations", never, never, {
     readonly subcommand: Option.Option<{
-        readonly limit: number;
-        readonly json: boolean;
-    } | {
-        readonly name: string;
-        readonly participants: string[];
-        readonly type: Option.Option<string>;
-    } | {
-        readonly conversationId: string;
-    } | {
-        readonly conversationId: string;
-        readonly until: Option.Option<string>;
-    } | {
-        readonly conversationId: string;
-    } | {
-        readonly conversationId: string;
-        readonly name: string;
-    } | {
-        readonly conversationId: string;
-        readonly participant: string;
-    } | {
-        readonly conversationId: string;
-        readonly participant: string;
-    } | {
-        readonly conversationId: string;
+        readonly taskId: string & import("effect/Brand").Brand<"TaskId">;
+        readonly conversationId: string & import("effect/Brand").Brand<"ConversationId">;
         readonly limit: number;
         readonly json: boolean;
         readonly sessionKey: Option.Option<string>;
-    } | {
-        readonly conversationId: string;
-    } | {
-        readonly conversationId: string;
-    } | {
-        readonly conversationId: string;
     }>;
 }>;
-/** Top-level `moltzap history &lt;conversationId>` — identical to `conversations history`. */
+/** Top-level `moltzap history &lt;taskId> &lt;conversationId>` — identical to `conversations history`. */
 export declare const historyCommand: Command.Command<"history", never, never, {
-    readonly conversationId: string;
+    readonly taskId: string & import("effect/Brand").Brand<"TaskId">;
+    readonly conversationId: string & import("effect/Brand").Brand<"ConversationId">;
     readonly limit: number;
     readonly json: boolean;
     readonly sessionKey: Option.Option<string>;
 }>;
-export {};
 //# sourceMappingURL=conversations.d.ts.map

package/dist/cli/commands/conversations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversations.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/conversations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,OAAO,EAAW,MAAM,aAAa,CAAC;AACrD,OAAO,EAAQ,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAsW9C,OAAO,EAGL,KAAK,SAAS,EACd,KAAK,cAAc,EACpB,MAAM,iBAAiB,CAAC;AAezB,2EAA2E;AAC3E,MAAM,MAAM,yBAAyB,GACjC,cAAc,GACd,uBAAuB,CAAC;;;;AAE5B,sEAAsE;AACtE,cAAM,uBAAwB,SAAQ,6BAEpC;IACA,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,CAAC;CAAG;AAEL,sGAAsG;AACtG,eAAO,MAAM,uBAAuB,GAAI,MAAM;IAC5C,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC,KAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,yBAAyB,EAAE,SAAS,CAQP,CAAC;AAEtD,8FAA8F;AAC9F,eAAO,MAAM,2BAA2B,GAAI,MAAM;IAChD,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC,KAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,yBAAyB,EAAE,SAAS,CAQH,CAAC;AAE1D,kGAAkG;AAClG,eAAO,MAAM,6BAA6B,GAAI,MAAM;IAClD,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC,KAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,yBAAyB,EAAE,SAAS,CAQD,CAAC;AAwB5D;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkBhC,CAAC;AAEF,8FAA8F;AAC9F,eAAO,MAAM,cAAc;;;;;EAS+C,CAAC"}
+{"version":3,"file":"conversations.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/conversations.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAQ,OAAO,EAAoB,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AAoJxC;;;;GAIG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;EAUhC,CAAC;AAEF,0GAA0G;AAC1G,eAAO,MAAM,cAAc;;;;;;EAU+C,CAAC"}

package/dist/cli/commands/conversations.js

@@ -1,9 +1,14 @@
-import { Args, Command, Options } from "@effect/cli";
-import { Data, Effect, Option } from "effect";
-import {} from "@moltzap/protocol";
-import { LocalServiceCommands, request, requestLocalService, resolveParticipant, } from "../socket-client.js";
+/**
+ * D3 cutover: only `history` survives; legacy list/create/archive/etc.
+ * subcommands ship in the D3 ADD slice once typed `Task*` CLI helpers
+ * land at the transport boundary.
+ */
+import { Args, Command, HelpDoc, Options } from "@effect/cli";
+import { Effect, Option } from "effect";
+import { Value } from "@sinclair/typebox/value";
+import { ConversationId, TaskId } from "@moltzap/protocol/task";
+import { LocalServiceCommands, requestLocalService } from "../socket-client.js";
 const jsonOption = Options.boolean("json").pipe(Options.withDescription("Output as JSON"));
-const DEFAULT_LIST_LIMIT = 20;
 const DEFAULT_HISTORY_LIMIT = 50;
 const JSON_INDENT_SPACES = 2;
 const MILLISECONDS_PER_MINUTE = 60_000;
@@ -11,114 +16,14 @@ const wrap = (effect, onSuccess) => effect.pipe(Effect.tap((value) => Effect.syn
     console.error(`Failed: ${err.message}`);
     process.exit(1);
 })));
-const limitOption = Options.integer("limit").pipe(Options.withDefault(DEFAULT_LIST_LIMIT), Options.withDescription("Max conversations to list"));
-const listConversations = Command.make("list", { limit: limitOption, json: jsonOption }, ({ limit, json }) => wrap(request(ConversationsList, { limit }), (r) => {
-    if (json) {
-        console.log(JSON.stringify(r.conversations, null, JSON_INDENT_SPACES));
-        return;
-    }
-    if (r.conversations.length === 0) {
-        console.log("No conversations.");
-        return;
-    }
-    for (const c of r.conversations) {
-        const unread = c.unreadCount > 0 ? ` (${c.unreadCount} unread)` : "";
-        const name = c.name ?? c.type;
-        console.log(`  ${c.id}  ${name}${unread}`);
-        if (c.lastMessagePreview) {
-            console.log(`    Last: ${c.lastMessagePreview}`);
-        }
-    }
-})).pipe(Command.withDescription("List conversations with unread counts"));
-const nameArg = Args.text({ name: "name" }).pipe(Args.withDescription("Conversation name"));
-const participantArg = Args.text({ name: "participant" }).pipe(Args.withDescription("Participant (e.g. agent:bob)"));
-const participantsArg = Args.text({ name: "participant" }).pipe(Args.withDescription("Participants (e.g. agent:bob)"), Args.repeated);
-const typeOption = Options.text("type").pipe(Options.withDescription("Conversation type: dm or group"), Options.optional);
-function resolveConversationType(type, participantCount) {
-    if (Option.isNone(type)) {
-        return Effect.succeed(participantCount === 1 ? "dm" : "group");
-    }
-    if (type.value === "dm" || type.value === "group") {
-        return Effect.succeed(type.value);
-    }
-    return Effect.fail(new ConversationsInputError({
-        message: `invalid conversation type: ${type.value}`,
-        reason: "type must be dm or group",
-    }));
-}
-const createConversation = Command.make("create", { name: nameArg, participants: participantsArg, type: typeOption }, ({ name, participants, type }) => Effect.gen(function* () {
-    const parsed = yield* Effect.all(participants.map((p) => resolveParticipant(p)));
-    const convType = yield* resolveConversationType(type, parsed.length);
-    const result = (yield* request(ConversationsCreate, {
-        type: convType,
-        name,
-        participants: parsed,
-    }));
-    console.log(`Conversation created: ${result.conversation.id} (${result.conversation.type})`);
-}).pipe(Effect.catchAll((err) => Effect.sync(() => {
-    console.error(`Failed: ${err.message}`);
-    process.exit(1);
-})))).pipe(Command.withDescription("Create a new conversation"));
-const conversationIdArg = Args.text({ name: "conversationId" }).pipe(Args.withDescription("Conversation ID"));
-const leaveConversation = Command.make("leave", { conversationId: conversationIdArg }, ({ conversationId: rawConversationId }) => wrap(request(ConversationsLeave, {
-    conversationId: rawConversationId,
-}), () => {
-    console.log(`Left conversation ${rawConversationId}.`);
-})).pipe(Command.withDescription("Leave a conversation"));
-const untilOption = Options.text("until").pipe(Options.withDescription("Mute until ISO datetime"), Options.optional);
-const muteConversation = Command.make("mute", { conversationId: conversationIdArg, until: untilOption }, ({ conversationId: rawConversationId, until }) => {
-    const params = Option.isSome(until)
-        ? {
-            conversationId: rawConversationId,
-            until: until.value,
-        }
-        : { conversationId: rawConversationId };
-    return wrap(request(ConversationsMute, params), () => {
-        console.log(Option.isSome(until)
-            ? `Conversation ${rawConversationId} muted until ${until.value}.`
-            : `Conversation ${rawConversationId} muted.`);
-    });
-}).pipe(Command.withDescription("Mute a conversation"));
-const unmuteConversation = Command.make("unmute", { conversationId: conversationIdArg }, ({ conversationId: rawConversationId }) => wrap(request(ConversationsUnmute, {
-    conversationId: rawConversationId,
-}), () => {
-    console.log(`Conversation ${rawConversationId} unmuted.`);
-})).pipe(Command.withDescription("Unmute a conversation"));
-const nameOption = Options.text("name").pipe(Options.withDescription("New conversation name"));
-const updateConversation = Command.make("update", { conversationId: conversationIdArg, name: nameOption }, ({ conversationId: rawConversationId, name }) => wrap(request(ConversationsUpdate, {
-    conversationId: rawConversationId,
-    name,
-}), () => {
-    console.log(`Conversation ${rawConversationId} updated.`);
-})).pipe(Command.withDescription("Update conversation settings"));
-const addParticipantCommand = Command.make("add-participant", { conversationId: conversationIdArg, participant: participantArg }, ({ conversationId: rawConversationId, participant }) => Effect.gen(function* () {
-    const ref = yield* resolveParticipant(participant);
-    yield* request(ConversationsAddParticipant, {
-        conversationId: rawConversationId,
-        participant: ref,
-    });
-    console.log(`Added ${participant} to ${rawConversationId}.`);
-}).pipe(Effect.catchAll((err) => Effect.sync(() => {
-    console.error(`Failed: ${err.message}`);
-    process.exit(1);
-})))).pipe(Command.withDescription("Add a participant to a conversation"));
-const removeParticipantCommand = Command.make("remove-participant", { conversationId: conversationIdArg, participant: participantArg }, ({ conversationId: rawConversationId, participant }) => Effect.gen(function* () {
-    const ref = yield* resolveParticipant(participant);
-    yield* request(ConversationsRemoveParticipant, {
-        conversationId: rawConversationId,
-        participant: ref,
-    });
-    console.log(`Removed ${participant} from ${rawConversationId}.`);
-}).pipe(Effect.catchAll((err) => Effect.sync(() => {
-    console.error(`Failed: ${err.message}`);
-    process.exit(1);
-})))).pipe(Command.withDescription("Remove a participant from a conversation"));
 const historyLimitOption = Options.integer("limit").pipe(Options.withDefault(DEFAULT_HISTORY_LIMIT), Options.withDescription("Max messages to show"));
 const sessionKeyOption = Options.text("session-key").pipe(Options.withDescription("Session key for cross-conversation context"), Options.optional);
+const taskIdArg = Args.text({ name: "taskId" }).pipe(Args.withDescription("Task ID"), Args.mapTryCatch((raw) => Value.Decode(TaskId, raw), (err) => HelpDoc.p(`invalid taskId: ${String(err)}`)));
+const conversationIdArg = Args.text({ name: "conversationId" }).pipe(Args.withDescription("Conversation ID"), Args.mapTryCatch((raw) => Value.Decode(ConversationId, raw), (err) => HelpDoc.p(`invalid conversationId: ${String(err)}`)));
 function renderHistoryHeader(conversationId, sessionKey, result) {
     if (!Option.isSome(sessionKey) || !result.conversationMeta)
         return;
-    const label = result.conversationMeta.name ?? result.conversationMeta.type;
+    const label = result.conversationMeta.name ?? "conversation";
     console.log(`Conversation: ${label} (${conversationId}) | ${result.newCount} new`);
     console.log("");
 }
@@ -147,79 +52,33 @@ const renderHistory = (conversationId, sessionKey, result, json) => {
         console.log("  ... more messages available");
     }
 };
-const historyHandler = ({ conversationId, limit, json, sessionKey, }) => {
+const historyHandler = ({ taskId, conversationId, limit, json, sessionKey, }) => {
     const params = Option.isSome(sessionKey)
-        ? { conversationId, limit, sessionKey: sessionKey.value }
-        : { conversationId, limit };
+        ? { taskId, conversationId, limit, sessionKey: sessionKey.value }
+        : { taskId, conversationId, limit };
     return wrap(requestLocalService(LocalServiceCommands.History, params), (result) => {
         renderHistory(conversationId, sessionKey, result, json);
     });
 };
 const historySubcommand = Command.make("history", {
+    taskId: taskIdArg,
     conversationId: conversationIdArg,
     limit: historyLimitOption,
     json: jsonOption,
     sessionKey: sessionKeyOption,
 }, historyHandler).pipe(Command.withDescription("Show message history for a conversation"));
-// ─── ARCH sbd#185: v2 subcommands (get / archive / unarchive) ──────────────
-import { rpc as transportRpc, runHandler as runConversationsHandler, } from "../transport.js";
-import { ConversationsAddParticipant, ConversationsArchive, ConversationsCreate, ConversationsGet, ConversationsLeave, ConversationsList, ConversationsMute, ConversationsRemoveParticipant, ConversationsUnarchive, ConversationsUnmute, ConversationsUpdate, } from "@moltzap/protocol";
-/** CLI-level input was rejected (architect stage: signature only). */
-class ConversationsInputError extends Data.TaggedError("ConversationsInputError") {
-}
-/** `moltzap conversations get <id>` → conversations/get; prints { conversation, participants }. */
-export const conversationsGetHandler = (args) => Effect.gen(function* () {
-    const result = yield* transportRpc(ConversationsGet, {
-        conversationId: args.conversationId,
-    });
-    yield* Effect.sync(() => {
-        console.log(JSON.stringify(result, null, JSON_INDENT_SPACES));
-    });
-}).pipe(Effect.withSpan("conversationsGetHandler"));
-/** `moltzap conversations archive <id>` → conversations/archive; prints success marker. */
-export const conversationsArchiveHandler = (args) => Effect.gen(function* () {
-    yield* transportRpc(ConversationsArchive, {
-        conversationId: args.conversationId,
-    });
-    yield* Effect.sync(() => {
-        console.log(`archived: ${args.conversationId}`);
-    });
-}).pipe(Effect.withSpan("conversationsArchiveHandler"));
-/** `moltzap conversations unarchive <id>` → conversations/unarchive; prints success marker. */
-export const conversationsUnarchiveHandler = (args) => Effect.gen(function* () {
-    yield* transportRpc(ConversationsUnarchive, {
-        conversationId: args.conversationId,
-    });
-    yield* Effect.sync(() => {
-        console.log(`unarchived: ${args.conversationId}`);
-    });
-}).pipe(Effect.withSpan("conversationsUnarchiveHandler"));
-// ── Command.make wrappers for the three v2 handlers ───────────────────────
-const getConversationCommand = Command.make("get", { conversationId: conversationIdArg }, ({ conversationId }) => runConversationsHandler(conversationsGetHandler({ conversationId }))).pipe(Command.withDescription("Get a conversation and its participants"));
-const archiveConversationCommand = Command.make("archive", { conversationId: conversationIdArg }, ({ conversationId }) => runConversationsHandler(conversationsArchiveHandler({ conversationId }))).pipe(Command.withDescription("Archive a conversation"));
-const unarchiveConversationCommand = Command.make("unarchive", { conversationId: conversationIdArg }, ({ conversationId }) => runConversationsHandler(conversationsUnarchiveHandler({ conversationId }))).pipe(Command.withDescription("Unarchive a conversation"));
 /**
- * `moltzap conversations [list|create|leave|mute|unmute|update|add-participant|remove-participant|history|get|archive|unarchive]`
- * — conversation CRUD + inspection over the local Unix socket. Default (no
- * subcommand) lists. The `get`, `archive`, `unarchive` subcommands are
- * wired by impl-staff against the handlers above (sbd#185).
+ * `moltzap conversations [history]` — the legacy CRUD subcommands
+ * retire with the `Conversations*` wire surface; restructure to
+ * `Task*` / `TaskConversation*` ships in the D3 ADD slice.
  */
-export const conversationsCommand = Command.make("conversations", {}, () => listConversations.handler({ limit: DEFAULT_LIST_LIMIT, json: false })).pipe(Command.withDescription("Manage conversations"), Command.withSubcommands([
-    listConversations,
-    createConversation,
-    leaveConversation,
-    muteConversation,
-    unmuteConversation,
-    updateConversation,
-    addParticipantCommand,
-    removeParticipantCommand,
-    historySubcommand,
-    getConversationCommand,
-    archiveConversationCommand,
-    unarchiveConversationCommand,
-]));
-/** Top-level `moltzap history <conversationId>` — identical to `conversations history`. */
+export const conversationsCommand = Command.make("conversations", {}, () => Effect.sync(() => {
+    console.log("moltzap conversations: only `history` is supported in this release.");
+    console.log("See `moltzap conversations history --help`.");
+})).pipe(Command.withDescription("Show conversation history"), Command.withSubcommands([historySubcommand]));
+/** Top-level `moltzap history <taskId> <conversationId>` — identical to `conversations history`. */
 export const historyCommand = Command.make("history", {
+    taskId: taskIdArg,
     conversationId: conversationIdArg,
     limit: historyLimitOption,
     json: jsonOption,

package/dist/cli/commands/conversations.js.map

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

package/dist/cli/commands/messages.d.ts

@@ -17,6 +17,7 @@
 import { Command } from "@effect/cli";
 import { Effect, Option } from "effect";
 import { type Transport, type TransportError } from "../transport.js";
+import { ConversationId, TaskId } from "@moltzap/protocol/task";
 export type MessagesCommandError = TransportError | MessagesInputError;
 declare const MessagesInputError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
     readonly _tag: "MessagesInputError";
@@ -32,7 +33,8 @@ declare class MessagesInputError extends MessagesInputError_base<{
  * question is resolved.
  */
 export interface MessagesListArgs {
-    readonly conversationId: string;
+    readonly taskId: TaskId;
+    readonly conversationId: ConversationId;
     readonly limit?: number;
 }
 /**
@@ -48,7 +50,8 @@ export declare const messagesListHandler: (args: MessagesListArgs) => Effect.Eff
 /** `moltzap messages [list]` subcommand group. */
 export declare const messagesCommand: Command.Command<"messages", Transport, never, {
     readonly subcommand: Option.Option<{
-        readonly conversation: string;
+        readonly task: string & import("effect/Brand").Brand<"TaskId">;
+        readonly conversation: string & import("effect/Brand").Brand<"ConversationId">;
         readonly limit: Option.Option<number>;
     }>;
 }>;

package/dist/cli/commands/messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/messages.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EAAE,OAAO,EAAW,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAQ,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAGL,KAAK,SAAS,EACd,KAAK,cAAc,EACpB,MAAM,iBAAiB,CAAC;AAOzB,MAAM,MAAM,oBAAoB,GAAG,cAAc,GAAG,kBAAkB,CAAC;;;;AAEvE,cAAM,kBAAmB,SAAQ,wBAAuC;IACtE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,CAAC;CAAG;AAIL;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CACzB;AAID;;;;;;;;GAQG;AACH,eAAO,MAAM,mBAAmB,GAC9B,MAAM,gBAAgB,KACrB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,oBAAoB,EAAE,SAAS,CAuBL,CAAC;AAqBlD,kDAAkD;AAClD,eAAO,MAAM,eAAe;;;;;EAW3B,CAAC"}
+{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/messages.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EAAE,OAAO,EAAoB,MAAM,aAAa,CAAC;AACxD,OAAO,EAAQ,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAGL,KAAK,SAAS,EACd,KAAK,cAAc,EACpB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAKhE,MAAM,MAAM,oBAAoB,GAAG,cAAc,GAAG,kBAAkB,CAAC;;;;AAEvE,cAAM,kBAAmB,SAAQ,wBAAuC;IACtE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,CAAC;CAAG;AAIL;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CACzB;AAID;;;;;;;;GAQG;AACH,eAAO,MAAM,mBAAmB,GAC9B,MAAM,gBAAgB,KACrB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,oBAAoB,EAAE,SAAS,CAwBL,CAAC;AAiClD,kDAAkD;AAClD,eAAO,MAAM,eAAe;;;;;;EAa3B,CAAC"}

package/dist/cli/commands/messages.js

@@ -14,10 +14,12 @@
  * backing in the current protocol; ESCALATED to spec rev 4. The flag is
  * deliberately absent from this interface until resolved.
  */
-import { Command, Options } from "@effect/cli";
+import { Command, HelpDoc, Options } from "@effect/cli";
 import { Data, Effect, Option } from "effect";
 import { rpc, runHandler, } from "../transport.js";
 import { MessagesList } from "@moltzap/protocol";
+import { ConversationId, TaskId } from "@moltzap/protocol/task";
+import { Value } from "@sinclair/typebox/value";
 class MessagesInputError extends Data.TaggedError("MessagesInputError") {
 }
 // ─── Handlers ──────────────────────────────────────────────────────────────
@@ -32,8 +34,9 @@ class MessagesInputError extends Data.TaggedError("MessagesInputError") {
  */
 export const messagesListHandler = (args) => Effect.gen(function* () {
     const params = args.limit === undefined
-        ? { conversationId: args.conversationId }
+        ? { taskId: args.taskId, conversationId: args.conversationId }
         : {
+            taskId: args.taskId,
             conversationId: args.conversationId,
             limit: args.limit,
         };
@@ -52,10 +55,12 @@ export const messagesListHandler = (args) => Effect.gen(function* () {
     });
 }).pipe(Effect.withSpan("messagesListHandler"));
 // ─── CLI commands ──────────────────────────────────────────────────────────
-const conversationOption = Options.text("conversation").pipe(Options.withDescription("Conversation id"));
+const taskOption = Options.text("task").pipe(Options.withDescription("Task id"), Options.mapTryCatch((raw) => Value.Decode(TaskId, raw), (err) => HelpDoc.p(`invalid --task: ${String(err)}`)));
+const conversationOption = Options.text("conversation").pipe(Options.withDescription("Conversation id"), Options.mapTryCatch((raw) => Value.Decode(ConversationId, raw), (err) => HelpDoc.p(`invalid --conversation: ${String(err)}`)));
 const msgLimitOption = Options.integer("limit").pipe(Options.optional);
-const messagesListCommand = Command.make("list", { conversation: conversationOption, limit: msgLimitOption }, ({ conversation, limit }) => {
+const messagesListCommand = Command.make("list", { task: taskOption, conversation: conversationOption, limit: msgLimitOption }, ({ task, conversation, limit }) => {
     const args = {
+        taskId: task,
         conversationId: conversation,
         ...(Option.isSome(limit) ? { limit: limit.value } : {}),
     };
@@ -63,7 +68,7 @@ const messagesListCommand = Command.make("list", { conversation: conversationOpt
 }).pipe(Command.withDescription("List messages in a conversation"));
 /** `moltzap messages [list]` subcommand group. */
 export const messagesCommand = Command.make("messages", {}, () => Effect.sync(() => {
-    console.log("Usage: moltzap messages list --conversation <id> [--limit N]");
+    console.log("Usage: moltzap messages list --task <id> --conversation <id> [--limit N]");
 })).pipe(Command.withDescription("Query message history. Runs as the identity selected by the global " +
     "--as / --profile flags (see `moltzap --help`); visibility is scoped " +
     "to conversations that caller participates in."), Command.withSubcommands([messagesListCommand]));

package/dist/cli/commands/messages.js.map

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

package/dist/cli/commands/messages.test.js

@@ -9,8 +9,10 @@ import { messagesListHandler } from "./messages.js";
 import { Transport } from "../transport.js";
 import { makeFakeTransport } from "./test-transport.js";
 import { MessagesList } from "@moltzap/protocol";
+import { conversationId as makeConversationId, taskId as makeTaskId, } from "@moltzap/protocol/testing";
 const it = effectIt.effect;
-const CONVERSATION_ID = "00000000-0000-4000-8000-00000000000c";
+const TASK_ID = makeTaskId("00000000-0000-4000-8000-00000000001a");
+const CONVERSATION_ID = makeConversationId("00000000-0000-4000-8000-00000000000c");
 const FIRST_MESSAGE_ID = "00000000-0000-4000-8000-00000000000a";
 const SECOND_MESSAGE_ID = "00000000-0000-4000-8000-00000000000b";
 const SENDER_A = "00000000-0000-4000-8000-0000000000a1";
@@ -46,6 +48,7 @@ function transportFailure() {
 }
 function runMessagesList(transport, limit) {
     return messagesListHandler({
+        taskId: TASK_ID,
         conversationId: CONVERSATION_ID,
         ...(limit !== undefined ? { limit } : {}),
     }).pipe(Effect.provideService(Transport, transport));
@@ -66,6 +69,7 @@ describe("messages list", () => {
         expect(calls[0]).toEqual({
             method: MessagesList.name,
             params: {
+                taskId: TASK_ID,
                 conversationId: CONVERSATION_ID,
                 limit: DEFAULT_LIMIT,
             },
@@ -82,6 +86,7 @@ describe("messages list", () => {
         const { calls, transport } = makeFakeTransport(emptyMessagesList);
         yield* runMessagesList(transport);
         expect(calls[0]?.params).toEqual({
+            taskId: TASK_ID,
             conversationId: CONVERSATION_ID,
         });
     }));

package/dist/cli/commands/messages.test.js.map

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

package/dist/cli/commands/send.d.ts

@@ -1,43 +1,12 @@
 import { Command } from "@effect/cli";
 import { Option } from "effect";
-/**
- * `moltzap send <target> <message> [--reply-to <id>]` — socket-call into
- * the local MoltZapService to enqueue an outbound message. `conv:` prefix
- * addresses a conversation id directly; otherwise `target` is passed as a
- * string the service resolves (typically `agent:<name>` for direct messages
- * or a bare contact name the service resolves against the caller's roster).
- *
- * Identity selection is driven by the parent `@effect/cli` options wired in
- * `cli/index.ts`:
- *
- *   --as <apiKey>       Send as the agent owning the given API key.
- *                       Bypasses the local daemon socket; dials the server
- *                       directly. Useful in multi-agent workflows where
- *                       the same host registers more than one agent.
- *   --profile <name>    Load the named profile from ~/.moltzap/config.json
- *                       and send as that agent. Short for looking up the
- *                       apiKey out of the profile and passing it as --as.
- *
- * If neither is provided, the command uses the legacy default profile
- * (top-level apiKey in ~/.moltzap/config.json) — the identity set by the
- * most recent `moltzap register` that did not use `--profile` or
- * `--no-persist`.
- *
- * Examples:
- *   moltzap send agent:bob "hello"                         # default identity
- *   moltzap --profile alice send agent:bob "hello"         # send as alice
- *   moltzap --as $BOB_API_KEY send conv:$CID "ack"         # send as bob
- *
- * NOTE: `moltzap send` today routes through the local channel daemon and
- * does NOT yet honor `--as`/`--profile` end-to-end — rewiring legacy
- * commands onto the v2 Transport layer is tracked as a follow-up (see the
- * PR body "Concerns" block). The flag semantics documented above describe
- * the v2 contract; new v2 subcommands (`apps/*`, `messages list`,
- * `conversations {get,archive,unarchive}`) honor them today.
- */
+import { ConversationId, TaskId } from "@moltzap/protocol/task";
 export declare const sendCommand: Command.Command<"send", never, never, {
-    readonly target: string;
+    readonly target: {
+        taskId: TaskId;
+        conversationId: ConversationId;
+    };
     readonly message: string;
-    readonly replyTo: Option.Option<string>;
+    readonly replyTo: Option.Option<string & import("effect/Brand").Brand<"MessageId">>;
 }>;
 //# sourceMappingURL=send.d.ts.map

package/dist/cli/commands/send.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/send.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,OAAO,EAAW,MAAM,aAAa,CAAC;AACrD,OAAO,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AAqBxC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,eAAO,MAAM,WAAW;;;;EAwDvB,CAAC"}
+{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/send.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,OAAO,EAAoB,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAgB,MAAM,EAAE,MAAM,QAAQ,CAAC;AAK9C,OAAO,EAAE,cAAc,EAAa,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAoD3E,eAAO,MAAM,WAAW;;gBArCH,MAAM;wBAAkB,cAAc;;;;EAsE1D,CAAC"}