@slock-ai/daemon 0.48.0 → 0.49.0

package/dist/cli/index.js

@@ -947,10 +947,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path) {
-  if (!path)
+function getElementAtPath(obj, path2) {
+  if (!path2)
     return obj;
-  return path.reduce((acc, key) => acc?.[key], obj);
+  return path2.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -1333,11 +1333,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path, issues) {
+function prefixIssues(path2, issues) {
   return issues.map((iss) => {
     var _a2;
     (_a2 = iss).path ?? (_a2.path = []);
-    iss.path.unshift(path);
+    iss.path.unshift(path2);
     return iss;
   });
 }
@@ -1520,7 +1520,7 @@ function formatError(error48, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error48, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error49, path = []) => {
+  const processError = (error49, path2 = []) => {
     var _a2, _b;
     for (const issue2 of error49.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
@@ -1530,7 +1530,7 @@ function treeifyError(error48, mapper = (issue2) => issue2.message) {
       } else if (issue2.code === "invalid_element") {
         processError({ issues: issue2.issues }, issue2.path);
       } else {
-        const fullpath = [...path, ...issue2.path];
+        const fullpath = [...path2, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -1562,8 +1562,8 @@ function treeifyError(error48, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path) {
+  const path2 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path2) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -13540,13 +13540,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path = ref.slice(1).split("/").filter(Boolean);
-  if (path.length === 0) {
+  const path2 = ref.slice(1).split("/").filter(Boolean);
+  if (path2.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path[0] === defsKey) {
-    const key = path[1];
+  if (path2[0] === defsKey) {
+    const key = path2[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -14410,7 +14410,7 @@ function formatServerInfo(data) {
   const humans = data.humans ?? [];
   text += formatRuntimeContext(data.runtimeContext);
   text += "### Channels\n";
-  text += 'Visible public channels may appear even when `joined=false`. Private channels are shown only when you are a member; do not disclose private-channel names, membership, or content outside that channel. Use `slock message read --channel "#name"` to inspect visible channels. When a channel is not joined, you cannot send messages there or receive ordinary channel delivery until a human adds you to the channel. To leave a channel you have joined, use `slock channel leave --target "#name"`. To stop following a thread, use `slock thread unfollow --target "#name:shortid"`.\n';
+  text += 'Visible public channels may appear even when `joined=false`. Private channels are shown only when you are a member; do not disclose private-channel names, membership, or content outside that channel. Use `slock message read --channel "#name"` to inspect visible channels. When a public channel is not joined, you can join it with `slock channel join --target "#name"` before sending messages or receiving ordinary channel delivery. Private channels require a human with access to add you. To leave a channel you have joined, use `slock channel leave --target "#name"`. To stop following a thread, use `slock thread unfollow --target "#name:shortid"`.\n';
   if (channels.length > 0) {
     for (const t of channels) {
       const visibility = t.type === "private" ? "private" : "public";
@@ -14507,36 +14507,6 @@ function registerChannelMembersCommand(parent) {
   });
 }
 
-// src/commands/server/info.ts
-function registerServerInfoCommand(parent) {
-  parent.command("info").description("List channels, agents, and humans on the current server").action(async () => {
-    let ctx;
-    try {
-      ctx = loadAgentContext();
-    } catch (err) {
-      if (err instanceof AgentBootstrapError) fail(err.code, err.message);
-      throw err;
-    }
-    const client = new ApiClient(ctx);
-    const res = await client.request(
-      "GET",
-      `/internal/agent/${encodeURIComponent(ctx.agentId)}/server`
-    );
-    if (!res.ok) {
-      const code = res.status >= 500 ? "SERVER_5XX" : "INFO_FAILED";
-      fail(code, res.error ?? `HTTP ${res.status}`);
-    }
-    const data = res.data;
-    if (data?.runtimeContext) {
-      data.runtimeContext = {
-        ...data.runtimeContext,
-        workspacePath: data.runtimeContext.workspacePath ?? process.env.SLOCK_CURRENT_WORKSPACE_PATH ?? null
-      };
-    }
-    process.stdout.write(formatServerInfo(data));
-  });
-}
-
 // src/commands/channel/leave.ts
 function parseRegularChannelTarget(target) {
   if (!target.startsWith("#")) return null;
@@ -14545,7 +14515,7 @@ function parseRegularChannelTarget(target) {
   return name.length > 0 ? name : null;
 }
 function formatLeaveChannelResult(target) {
-  return `Left ${target}. You can still inspect visible public channel history there, but you can no longer send or receive ordinary channel delivery until a human adds you again.`;
+  return `Left ${target}. You can still inspect visible public channel history there, but you can no longer send or receive ordinary channel delivery until you join the public channel again or a human re-adds you to a private channel.`;
 }
 function formatAlreadyNotJoined(target) {
   return `Already not joined in ${target}.`;
@@ -14592,6 +14562,85 @@ function registerChannelLeaveCommand(parent) {
   });
 }
 
+// src/commands/channel/join.ts
+function formatJoinChannelResult(target) {
+  return `Joined ${target}. You can now send messages there and receive ordinary channel delivery.`;
+}
+function formatAlreadyJoined(target) {
+  return `Already joined ${target}.`;
+}
+function registerChannelJoinCommand(parent) {
+  parent.command("join").description("Join a visible public channel").requiredOption("--target <target>", "Regular channel to join, e.g. '#engineering'").action(async (opts) => {
+    const channelName = parseRegularChannelTarget(opts.target);
+    if (!channelName) {
+      fail("INVALID_TARGET", "Target must be a regular channel in the form '#channel-name'. DMs and thread targets are not supported.");
+    }
+    let ctx;
+    try {
+      ctx = loadAgentContext();
+    } catch (err) {
+      if (err instanceof AgentBootstrapError) fail(err.code, err.message);
+      throw err;
+    }
+    const client = new ApiClient(ctx);
+    const infoRes = await client.request(
+      "GET",
+      `/internal/agent/${encodeURIComponent(ctx.agentId)}/server`
+    );
+    if (!infoRes.ok) {
+      const code = infoRes.status >= 500 ? "SERVER_5XX" : "INFO_FAILED";
+      fail(code, infoRes.error ?? `HTTP ${infoRes.status}`);
+    }
+    const channel = (infoRes.data?.channels ?? []).find((candidate) => candidate.name === channelName);
+    if (!channel) {
+      fail("NOT_FOUND", `Channel not found: ${opts.target}`);
+    }
+    if (channel.joined) {
+      process.stdout.write(formatAlreadyJoined(opts.target) + "\n");
+      return;
+    }
+    const joinRes = await client.request(
+      "POST",
+      `/internal/agent/${encodeURIComponent(ctx.agentId)}/channels/${encodeURIComponent(channel.id)}/join`
+    );
+    if (!joinRes.ok) {
+      const code = joinRes.status >= 500 ? "SERVER_5XX" : "JOIN_FAILED";
+      fail(code, joinRes.error ?? `HTTP ${joinRes.status}`);
+    }
+    process.stdout.write(formatJoinChannelResult(opts.target) + "\n");
+  });
+}
+
+// src/commands/server/info.ts
+function registerServerInfoCommand(parent) {
+  parent.command("info").description("List channels, agents, and humans on the current server").action(async () => {
+    let ctx;
+    try {
+      ctx = loadAgentContext();
+    } catch (err) {
+      if (err instanceof AgentBootstrapError) fail(err.code, err.message);
+      throw err;
+    }
+    const client = new ApiClient(ctx);
+    const res = await client.request(
+      "GET",
+      `/internal/agent/${encodeURIComponent(ctx.agentId)}/server`
+    );
+    if (!res.ok) {
+      const code = res.status >= 500 ? "SERVER_5XX" : "INFO_FAILED";
+      fail(code, res.error ?? `HTTP ${res.status}`);
+    }
+    const data = res.data;
+    if (data?.runtimeContext) {
+      data.runtimeContext = {
+        ...data.runtimeContext,
+        workspacePath: data.runtimeContext.workspacePath ?? process.env.SLOCK_CURRENT_WORKSPACE_PATH ?? null
+      };
+    }
+    process.stdout.write(formatServerInfo(data));
+  });
+}
+
 // src/commands/thread/unfollow.ts
 var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 var SHORT_ID_RE = /^[0-9a-f]{8}$/i;
@@ -14644,6 +14693,69 @@ function registerThreadUnfollowCommand(parent) {
   });
 }
 
+// src/commands/message/_continueDraftState.ts
+import fs2 from "fs";
+import os from "os";
+import path from "path";
+var DEFAULT_LOCAL_DRAFT_TTL_MS = 10 * 60 * 1e3;
+function stateFilePath(agentId) {
+  return path.join(process.env.SLOCK_CLI_DRAFT_STATE_DIR ?? os.tmpdir(), "slock-cli-attested-send", agentId, "continue-state.json");
+}
+function readState(agentId) {
+  const filePath = stateFilePath(agentId);
+  try {
+    const raw = fs2.readFileSync(filePath, "utf8");
+    const parsed = JSON.parse(raw);
+    return typeof parsed === "object" && parsed ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+function writeState(agentId, state) {
+  const filePath = stateFilePath(agentId);
+  fs2.mkdirSync(path.dirname(filePath), { recursive: true });
+  fs2.writeFileSync(filePath, JSON.stringify(state), "utf8");
+}
+function getSavedDraft(agentId, target) {
+  const state = readState(agentId);
+  const draft = state.targets?.[target];
+  if (!draft || typeof draft === "string") return null;
+  if (typeof draft.content !== "string") return null;
+  const attachmentIds = Array.isArray(draft.attachmentIds) ? draft.attachmentIds.filter((item) => typeof item === "string") : [];
+  const savedAt = Number.isFinite(draft.savedAt) ? draft.savedAt : Date.now();
+  const reholdCount = Number.isFinite(draft.reholdCount) ? draft.reholdCount : 0;
+  const seenUpToSeq = Number.isFinite(draft.seenUpToSeq) ? draft.seenUpToSeq : void 0;
+  if (Date.now() - savedAt > DEFAULT_LOCAL_DRAFT_TTL_MS) {
+    clearSavedDraft(agentId, target);
+    return null;
+  }
+  return {
+    content: draft.content,
+    attachmentIds,
+    savedAt,
+    reholdCount,
+    seenUpToSeq
+  };
+}
+function setSavedDraft(agentId, target, draft) {
+  const state = readState(agentId);
+  const targets = state.targets ?? {};
+  targets[target] = {
+    content: draft.content,
+    attachmentIds: draft.attachmentIds,
+    savedAt: draft.savedAt,
+    reholdCount: draft.reholdCount,
+    ...draft.seenUpToSeq !== void 0 ? { seenUpToSeq: draft.seenUpToSeq } : {}
+  };
+  writeState(agentId, { targets });
+}
+function clearSavedDraft(agentId, target) {
+  const state = readState(agentId);
+  if (!state.targets || !(target in state.targets)) return;
+  delete state.targets[target];
+  writeState(agentId, state);
+}
+
 // src/commands/message/_format.ts
 function toLocalTime(iso) {
   const d = new Date(iso);
@@ -14811,6 +14923,13 @@ async function resolveSendContent(input = process.stdin) {
   }
   return content;
 }
+async function resolveOptionalSendContent(input = process.stdin) {
+  if (input.isTTY) {
+    return void 0;
+  }
+  const content = await readStream2(input);
+  return content.trim().length > 0 ? content : void 0;
+}
 function rejectArgContent(positionalContent, opts) {
   if (positionalContent.length > 0) {
     throw new SendContentError(
@@ -14835,8 +14954,35 @@ function rejectArgContent(positionalContent, opts) {
     );
   }
 }
+function validateDraftSendFlags(opts) {
+  if (opts.anyway && !opts.sendDraft) {
+    throw new SendContentError(
+      "SEND_DRAFT_ANYWAY_REQUIRES_SEND_DRAFT",
+      "--anyway can only be used together with --send-draft."
+    );
+  }
+  if (opts.sendDraft && opts.attachmentId && opts.attachmentId.length > 0) {
+    throw new SendContentError(
+      "SEND_DRAFT_ATTACHMENTS_UNSUPPORTED",
+      "--attachment-id cannot be used with --send-draft. Use a normal send to replace the draft."
+    );
+  }
+}
+function rejectSendDraftStdin(content, target) {
+  if (content === void 0) return;
+  throw new SendContentError(
+    "SEND_DRAFT_STDIN_UNSUPPORTED",
+    [
+      "--send-draft sends the current saved draft and does not accept stdin.",
+      "To update the draft, send the revised content normally without --send-draft:",
+      `  slock message send --target "${target}" <<'EOF'`,
+      "  revised message",
+      "  EOF"
+    ].join("\n")
+  );
+}
 function registerSendCommand(parent) {
-  parent.command("send").description("Send a message to a channel, DM, or thread").argument("[content...]", "Unsupported positional message content. Pipe content to stdin instead.").requiredOption("--target <target>", "Target: '#channel', 'dm:@peer', '#channel:threadId', 'dm:@peer:threadId'").option("--content <content>", "Unsupported. Pipe message content to stdin instead.").option(
+  parent.command("send").description("Send a message to a channel, DM, or thread").argument("[content...]", "Unsupported positional message content. Pipe content to stdin instead.").requiredOption("--target <target>", "Target: '#channel', 'dm:@peer', '#channel:threadId', 'dm:@peer:threadId'").option("--send-draft", "Send the current saved draft after reviewing newer messages").option("--anyway", "Escape hatch: send a saved draft even if freshness re-check is still stale").option("--content <content>", "Unsupported. Pipe message content to stdin instead.").option(
     "--attachment-id <id>",
     "Attachment id to link (repeatable). Get one from `slock attachment upload`.",
     (value, prev = []) => prev.concat(value)
@@ -14855,16 +15001,72 @@ function registerSendCommand(parent) {
       throw err;
     }
     const client = new ApiClient(ctx);
-    let content;
     try {
-      content = await resolveSendContent();
+      validateDraftSendFlags(opts);
     } catch (err) {
       if (err instanceof SendContentError) fail(err.code, err.message);
       throw err;
     }
-    const body = { target: opts.target, content };
-    if (opts.attachmentId && opts.attachmentId.length > 0) {
-      body.attachmentIds = opts.attachmentId;
+    let content;
+    let outgoingContent;
+    let outgoingAttachmentIds = [];
+    let previousDraftReholdCount = 0;
+    let seenUpToSeq;
+    if (opts.sendDraft) {
+      content = await resolveOptionalSendContent();
+      try {
+        rejectSendDraftStdin(content, opts.target);
+      } catch (err) {
+        if (err instanceof SendContentError) fail(err.code, err.message);
+        throw err;
+      }
+      const savedDraft = getSavedDraft(ctx.agentId, opts.target);
+      if (!savedDraft) {
+        fail(
+          "SEND_DRAFT_NOT_FOUND",
+          [
+            "No saved draft exists for this target.",
+            "To create or update a draft, send message content normally:",
+            `  slock message send --target "${opts.target}" <<'EOF'`,
+            "  message body",
+            "  EOF"
+          ].join("\n")
+        );
+        return;
+      }
+      outgoingContent = savedDraft.content;
+      outgoingAttachmentIds = savedDraft.attachmentIds;
+      previousDraftReholdCount = savedDraft.reholdCount;
+      seenUpToSeq = savedDraft.seenUpToSeq;
+    } else {
+      try {
+        content = await resolveSendContent();
+      } catch (err) {
+        if (err instanceof SendContentError) fail(err.code, err.message);
+        throw err;
+      }
+      outgoingContent = content;
+      outgoingAttachmentIds = opts.attachmentId && opts.attachmentId.length > 0 ? opts.attachmentId : [];
+      const previousDraft = getSavedDraft(ctx.agentId, opts.target);
+      previousDraftReholdCount = previousDraft?.reholdCount ?? 0;
+      seenUpToSeq = previousDraft?.seenUpToSeq;
+    }
+    const body = {
+      target: opts.target,
+      content: outgoingContent,
+      draftReholdCount: previousDraftReholdCount
+    };
+    if (seenUpToSeq !== void 0) {
+      body.seenUpToSeq = seenUpToSeq;
+    }
+    if (opts.sendDraft) {
+      body.sendDraft = true;
+      if (opts.anyway) body.continueAnyway = true;
+    } else {
+      body.draftReplacedExisting = previousDraftReholdCount > 0;
+    }
+    if (outgoingAttachmentIds.length > 0) {
+      body.attachmentIds = outgoingAttachmentIds;
     }
     const res = await client.request(
       "POST",
@@ -14876,6 +15078,37 @@ function registerSendCommand(parent) {
       fail(code, res.error ?? `HTTP ${res.status}`);
     }
     const data = res.data;
+    if (data.state === "held") {
+      setSavedDraft(ctx.agentId, opts.target, {
+        content: outgoingContent,
+        attachmentIds: outgoingAttachmentIds,
+        savedAt: Date.now(),
+        reholdCount: previousDraftReholdCount + 1,
+        seenUpToSeq: data.seenUpToSeq
+      });
+      const heldHistory = data.heldMessages && data.heldMessages.length > 0 ? `
+
+${formatHistory(opts.target, { messages: data.heldMessages })}` : "";
+      const mentionNote = (data.mentionAnnotation?.formalMentionCount ?? 0) > 0 ? `
+
+Note: ${data.mentionAnnotation.formalMentionCount} of these messages formally @mention you.` : "";
+      process.stdout.write(
+        `Not sent yet \u2014 ${data.newMessageCount ?? 0} newer message(s) arrived.
+Your message has been saved as a draft. Read the new messages below, then choose one path.${mentionNote}${heldHistory}
+
+To update the draft, send revised content normally:
+  slock message send --target "${opts.target}" <<'EOF'
+  revised message
+  EOF
+To send the current draft unchanged:
+  slock message send --send-draft --target "${opts.target}"
+` + (data.continueAnywaySuggested ? `If repeated updates keep blocking the same draft and this is still the right reply, you may use:
+  slock message send --send-draft --anyway --target "${opts.target}"
+` : "")
+      );
+      return;
+    }
+    clearSavedDraft(ctx.agentId, opts.target);
     const shortId = data.messageId ? data.messageId.slice(0, 8) : null;
     const replyHint = shortId ? ` (to reply in this message's thread, use target "${opts.target.includes(":") ? opts.target : opts.target + ":" + shortId}")` : "";
     let unreadSection = "";
@@ -14898,8 +15131,8 @@ async function drainInbox(ctx, opts) {
   const query = [];
   if (opts.block) query.push("block=true");
   if (opts.block && opts.timeoutMs !== void 0) query.push(`timeout=${opts.timeoutMs}`);
-  const path = query.length > 0 ? `${agentPath}/receive?${query.join("&")}` : `${agentPath}/receive`;
-  const res = await client.request("GET", path);
+  const path2 = query.length > 0 ? `${agentPath}/receive?${query.join("&")}` : `${agentPath}/receive`;
+  const res = await client.request("GET", path2);
   if (!res.ok) {
     const code = res.status >= 500 ? "SERVER_5XX" : failCode;
     fail(code, res.error ?? `HTTP ${res.status}`);
@@ -16097,6 +16330,7 @@ var authCmd = program.command("auth").description("Auth introspection");
 registerWhoamiCommand(authCmd);
 var channelCmd = program.command("channel").description("Channel membership operations");
 registerChannelMembersCommand(channelCmd);
+registerChannelJoinCommand(channelCmd);
 registerChannelLeaveCommand(channelCmd);
 var threadCmd = program.command("thread").description("Thread attention operations");
 registerThreadUnfollowCommand(threadCmd);

package/dist/core.js

@@ -9,10 +9,10 @@ import {
   resolveSlockCliPath,
   resolveWorkspaceDirectoryPath,
   scanWorkspaceDirectories
-} from "./chunk-EDE2E6QR.js";
+} from "./chunk-M4A5QPUN.js";
 import {
   subscribeDaemonLogs
-} from "./chunk-B7XIMLOT.js";
+} from "./chunk-KNMCE6WB.js";
 export {
   DAEMON_CLI_USAGE,
   DaemonCore,

package/dist/index.js

@@ -3,8 +3,8 @@ import {
   DAEMON_CLI_USAGE,
   DaemonCore,
   parseDaemonCliArgs
-} from "./chunk-EDE2E6QR.js";
-import "./chunk-B7XIMLOT.js";
+} from "./chunk-M4A5QPUN.js";
+import "./chunk-KNMCE6WB.js";
 
 // src/index.ts
 var parsedArgs = parseDaemonCliArgs(process.argv.slice(2));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slock-ai/daemon",
-  "version": "0.48.0",
+  "version": "0.49.0",
   "type": "module",
   "bin": {
     "slock-daemon": "dist/index.js"