codeksei 0.1.0 → 0.1.1

package/src/app/system-send-cli.js

@@ -1,129 +1,129 @@
-const crypto = require("crypto");
-const fs = require("fs");
-const path = require("path");
-
-const { resolveSelectedAccount } = require("../adapters/channel/weixin/account-store");
-const { loadPersistedContextTokens } = require("../adapters/channel/weixin/context-token-store");
-const { SessionStore } = require("../adapters/runtime/codex/session-store");
-const { resolvePreferredSenderId, resolvePreferredWorkspaceRoot } = require("../core/default-targets");
-const { SystemMessageQueueStore } = require("../core/system-message-queue-store");
-
-async function runSystemSendCommand(config) {
-  const options = parseSystemSendArgs(process.argv.slice(4));
-  if (options.help) {
-    printSystemSendHelp();
-    return;
-  }
-
-  const account = resolveSelectedAccount(config);
-  const sessionStore = new SessionStore({ filePath: config.sessionsFile });
-  const senderId = resolvePreferredSenderId({
-    config,
-    accountId: account.accountId,
-    explicitUser: options.user,
-    sessionStore,
-  });
-  const text = options.text;
-  const workspaceRoot = resolvePreferredWorkspaceRoot({
-    config,
-    accountId: account.accountId,
-    senderId,
-    explicitWorkspace: options.workspace,
-    sessionStore,
-  });
-  if (!senderId || !text || !workspaceRoot) {
-    printSystemSendHelp();
-    throw new Error("system send 缺少必要参数");
-  }
-  if (!path.isAbsolute(workspaceRoot)) {
-    throw new Error(`workspace 必须是绝对路径: ${workspaceRoot}`);
-  }
-
-  let workspaceStats = null;
-  try {
-    workspaceStats = fs.statSync(workspaceRoot);
-  } catch {
-    throw new Error(`workspace 不存在: ${workspaceRoot}`);
-  }
-  if (!workspaceStats.isDirectory()) {
-    throw new Error(`workspace 不是目录: ${workspaceRoot}`);
-  }
-
-  const contextTokens = loadPersistedContextTokens(config, account.accountId);
-  if (!contextTokens[senderId]) {
-    throw new Error(`找不到用户 ${senderId} 的 context token，先让这个用户和 bot 聊过一次`);
-  }
-  const queue = new SystemMessageQueueStore({ filePath: config.systemMessageQueueFile });
-  const queued = queue.enqueue({
-    id: crypto.randomUUID(),
-    accountId: account.accountId,
-    senderId,
-    workspaceRoot,
-    text,
-    createdAt: new Date().toISOString(),
-  });
-
-  console.log(`system message queued: ${queued.id}`);
-  console.log(`user: ${queued.senderId}`);
-  console.log(`workspace: ${queued.workspaceRoot}`);
-}
-
-function parseSystemSendArgs(args) {
-  const options = {
-    help: false,
-    user: "",
-    text: "",
-    workspace: "",
-  };
-
-  for (let index = 0; index < args.length; index += 1) {
-    const token = String(args[index] || "").trim();
-    if (!token) {
-      continue;
-    }
-
-    if (token === "--help" || token === "-h") {
-      options.help = true;
-      continue;
-    }
-
-    if (!token.startsWith("--")) {
-      throw new Error(`未知参数: ${token}`);
-    }
-
-    const key = token.slice(2);
-    const value = String(args[index + 1] || "");
-    if (!value || value.startsWith("--")) {
-      throw new Error(`参数缺少值: ${token}`);
-    }
-
-    if (key === "user") {
-      options.user = value.trim();
-    } else if (key === "text") {
-      options.text = value.trim();
-    } else if (key === "workspace") {
-      options.workspace = value.trim();
-    } else {
-      throw new Error(`未知参数: ${token}`);
-    }
-
-    index += 1;
-  }
-
-  return options;
-}
-
-function printSystemSendHelp() {
-  console.log(`
-用法: npm run system:send -- --text "<message>" [--user <wechat_user_id>] [--workspace /绝对路径]
-
-示例:
-  npm run system:send -- --text "提醒她今天早点睡" --workspace "$(pwd)"
-`);
-}
-
-function normalizeWorkspacePath(value) {
-  return typeof value === "string" ? value.trim() : "";
-}
-
-module.exports = { runSystemSendCommand };
+const crypto = require("crypto");
+const fs = require("fs");
+const path = require("path");
+
+const { resolveSelectedAccount } = require("../adapters/channel/weixin/account-store");
+const { loadPersistedContextTokens } = require("../adapters/channel/weixin/context-token-store");
+const { SessionStore } = require("../adapters/runtime/codex/session-store");
+const { resolvePreferredSenderId, resolvePreferredWorkspaceRoot } = require("../core/default-targets");
+const { SystemMessageQueueStore } = require("../core/system-message-queue-store");
+
+async function runSystemSendCommand(config) {
+  const options = parseSystemSendArgs(process.argv.slice(4));
+  if (options.help) {
+    printSystemSendHelp();
+    return;
+  }
+
+  const account = resolveSelectedAccount(config);
+  const sessionStore = new SessionStore({ filePath: config.sessionsFile });
+  const senderId = resolvePreferredSenderId({
+    config,
+    accountId: account.accountId,
+    explicitUser: options.user,
+    sessionStore,
+  });
+  const text = options.text;
+  const workspaceRoot = resolvePreferredWorkspaceRoot({
+    config,
+    accountId: account.accountId,
+    senderId,
+    explicitWorkspace: options.workspace,
+    sessionStore,
+  });
+  if (!senderId || !text || !workspaceRoot) {
+    printSystemSendHelp();
+    throw new Error("system send 缺少必要参数");
+  }
+  if (!path.isAbsolute(workspaceRoot)) {
+    throw new Error(`workspace 必须是绝对路径: ${workspaceRoot}`);
+  }
+
+  let workspaceStats = null;
+  try {
+    workspaceStats = fs.statSync(workspaceRoot);
+  } catch {
+    throw new Error(`workspace 不存在: ${workspaceRoot}`);
+  }
+  if (!workspaceStats.isDirectory()) {
+    throw new Error(`workspace 不是目录: ${workspaceRoot}`);
+  }
+
+  const contextTokens = loadPersistedContextTokens(config, account.accountId);
+  if (!contextTokens[senderId]) {
+    throw new Error(`找不到用户 ${senderId} 的 context token，先让这个用户和 bot 聊过一次`);
+  }
+  const queue = new SystemMessageQueueStore({ filePath: config.systemMessageQueueFile });
+  const queued = queue.enqueue({
+    id: crypto.randomUUID(),
+    accountId: account.accountId,
+    senderId,
+    workspaceRoot,
+    text,
+    createdAt: new Date().toISOString(),
+  });
+
+  console.log(`system message queued: ${queued.id}`);
+  console.log(`user: ${queued.senderId}`);
+  console.log(`workspace: ${queued.workspaceRoot}`);
+}
+
+function parseSystemSendArgs(args) {
+  const options = {
+    help: false,
+    user: "",
+    text: "",
+    workspace: "",
+  };
+
+  for (let index = 0; index < args.length; index += 1) {
+    const token = String(args[index] || "").trim();
+    if (!token) {
+      continue;
+    }
+
+    if (token === "--help" || token === "-h") {
+      options.help = true;
+      continue;
+    }
+
+    if (!token.startsWith("--")) {
+      throw new Error(`未知参数: ${token}`);
+    }
+
+    const key = token.slice(2);
+    const value = String(args[index + 1] || "");
+    if (!value || value.startsWith("--")) {
+      throw new Error(`参数缺少值: ${token}`);
+    }
+
+    if (key === "user") {
+      options.user = value.trim();
+    } else if (key === "text") {
+      options.text = value.trim();
+    } else if (key === "workspace") {
+      options.workspace = value.trim();
+    } else {
+      throw new Error(`未知参数: ${token}`);
+    }
+
+    index += 1;
+  }
+
+  return options;
+}
+
+function printSystemSendHelp() {
+  console.log(`
+用法: npm run system:send -- --text "<message>" [--user <wechat_user_id>] [--workspace /绝对路径]
+
+示例:
+  npm run system:send -- --text "提醒她今天早点睡" --workspace "$(pwd)"
+`);
+}
+
+function normalizeWorkspacePath(value) {
+  return typeof value === "string" ? value.trim() : "";
+}
+
+module.exports = { runSystemSendCommand };

package/src/app/timeline-event-cli.js

@@ -1,16 +1,20 @@
 const crypto = require("crypto");
-
-const LOCAL_TIMEZONE_OFFSET = "+08:00";
-
-async function runTimelineEventCommand(timelineIntegration, args = process.argv.slice(4)) {
+const {
+  LEGACY_TIMELINE_TIMEZONE,
+  coerceLocalDateTimeToIso,
+} = require("../core/timezone");
+
+async function runTimelineEventCommand(timelineIntegration, configOrArgs = {}, argsMaybe = process.argv.slice(4)) {
+  const config = Array.isArray(configOrArgs) ? {} : (configOrArgs || {});
+  const args = Array.isArray(configOrArgs) ? configOrArgs : argsMaybe;
   const options = parseTimelineEventArgs(args);
   if (options.help) {
-    printTimelineEventHelp();
+    printTimelineEventHelp(config.timezone);
     return;
   }
 
   const note = await resolveNote(options);
-  const writeArgs = buildTimelineEventWriteArgs(options, note);
+  const writeArgs = buildTimelineEventWriteArgs(options, note, config);
   await timelineIntegration.runSubcommand("write", writeArgs);
 }
 
@@ -109,11 +113,12 @@ async function resolveNote(options) {
   return normalizeText(await readStdin());
 }
 
-function buildTimelineEventWriteArgs(options, note = "") {
+function buildTimelineEventWriteArgs(options, note = "", config = {}) {
   const date = normalizeDate(options.date);
   if (!date) {
     throw new Error("缺少有效日期，使用 --date YYYY-MM-DD");
   }
+  const timezone = normalizeTimezoneConfigValue(config.timezone) || LEGACY_TIMELINE_TIMEZONE;
 
   const title = normalizeText(options.title);
   if (!title) {
@@ -129,8 +134,8 @@ function buildTimelineEventWriteArgs(options, note = "") {
     throw new Error("缺少分类信息，至少传 --event-node 或 --subcategory");
   }
 
-  const startAt = normalizeTimelineEventTimestamp(date, options.start, "--start");
-  const endAt = normalizeTimelineEventTimestamp(date, options.end, "--end");
+  const startAt = normalizeTimelineEventTimestamp(date, options.start, "--start", timezone);
+  const endAt = normalizeTimelineEventTimestamp(date, options.end, "--end", timezone);
   validateEventRange({ date, startAt, endAt });
 
   const event = {
@@ -179,26 +184,18 @@ function normalizeDate(value) {
   return /^\d{4}-\d{2}-\d{2}$/.test(normalized) ? normalized : "";
 }
 
-function normalizeTimelineEventTimestamp(date, value, flagName) {
+function normalizeTimelineEventTimestamp(date, value, flagName, timezone = LEGACY_TIMELINE_TIMEZONE) {
   const normalized = normalizeText(value);
   if (!normalized) {
     throw new Error(`缺少时间，使用 ${flagName} HH:mm 或完整时间戳`);
   }
 
-  if (/^\d{2}:\d{2}$/.test(normalized)) {
-    return `${date}T${normalized}:00${LOCAL_TIMEZONE_OFFSET}`;
-  }
-
-  if (/^\d{2}:\d{2}:\d{2}$/.test(normalized)) {
-    return `${date}T${normalized}${LOCAL_TIMEZONE_OFFSET}`;
-  }
-
-  if (/^\d{4}-\d{2}-\d{2}[ T]\d{2}:\d{2}(:\d{2})?$/.test(normalized)) {
-    return `${normalized.replace(" ", "T")}${LOCAL_TIMEZONE_OFFSET}`;
-  }
-
-  if (/^\d{4}-\d{2}-\d{2}[T ]\d{2}:\d{2}(:\d{2})?([zZ]|[+-]\d{2}:\d{2})$/.test(normalized)) {
-    return normalized.replace(" ", "T");
+  const timestamp = coerceLocalDateTimeToIso(normalized, {
+    timeZone: timezone,
+    defaultDate: date,
+  });
+  if (timestamp) {
+    return timestamp;
   }
 
   throw new Error(`不支持的时间格式: ${flagName}=${normalized}`);
@@ -235,7 +232,8 @@ function normalizeText(value) {
   return String(value || "").replace(/\r\n/g, "\n").trim();
 }
 
-function printTimelineEventHelp() {
+function printTimelineEventHelp(timezone = LEGACY_TIMELINE_TIMEZONE) {
+  const resolvedTimezone = normalizeTimezoneConfigValue(timezone) || LEGACY_TIMELINE_TIMEZONE;
   console.log(`
 用法: npm run timeline:event -- --date YYYY-MM-DD --start HH:mm --end HH:mm --title "标题" (--event-node <id> | --subcategory <id>) [其他参数]
 
@@ -243,6 +241,7 @@ function printTimelineEventHelp() {
   - 写单条时间轴事件，不必手写 raw JSON
   - 适合把一个明确的时间块快速追加进当天 timeline
   - 如果要一次写多条事件，或直接替换整批 events，继续用 timeline:write
+  - 不带 offset 的本地时间默认按 ${resolvedTimezone} 解释
 
 常用参数:
   --date YYYY-MM-DD
@@ -271,3 +270,7 @@ module.exports = {
   buildTimelineEventWriteArgs,
   normalizeTimelineEventTimestamp,
 };
+
+function normalizeTimezoneConfigValue(value) {
+  return typeof value === "string" ? value.trim() : "";
+}

package/src/app/timeline-screenshot-cli.js

@@ -1,109 +1,112 @@
-const crypto = require("crypto");
-const path = require("path");
-
-const { resolveSelectedAccount } = require("../adapters/channel/weixin/account-store");
-const { SessionStore } = require("../adapters/runtime/codex/session-store");
-const { resolvePreferredSenderId } = require("../core/default-targets");
-const { TimelineScreenshotQueueStore } = require("../core/timeline-screenshot-queue-store");
-
-async function runTimelineScreenshotCommand(config, args = process.argv.slice(4)) {
-  const options = parseTimelineScreenshotArgs(args);
-  if (options.help) {
-    printTimelineScreenshotHelp();
-    return;
-  }
-
-  const account = resolveSelectedAccount(config);
-  const sessionStore = new SessionStore({ filePath: config.sessionsFile });
-  const senderId = resolvePreferredSenderId({
-    config,
-    accountId: account.accountId,
-    explicitUser: options.user,
-    sessionStore,
-  });
-
+const crypto = require("crypto");
+const path = require("path");
+
+const { resolveSelectedAccount } = require("../adapters/channel/weixin/account-store");
+const { SessionStore } = require("../adapters/runtime/codex/session-store");
+const { resolvePreferredSenderId } = require("../core/default-targets");
+const { TimelineScreenshotQueueStore } = require("../core/timeline-screenshot-queue-store");
+
+async function runTimelineScreenshotCommand(config, args = process.argv.slice(4)) {
+  const options = parseTimelineScreenshotArgs(args);
+  if (options.help) {
+    printTimelineScreenshotHelp();
+    return;
+  }
+
+  const account = resolveSelectedAccount(config);
+  const sessionStore = new SessionStore({ filePath: config.sessionsFile });
+  const senderId = resolvePreferredSenderId({
+    config,
+    accountId: account.accountId,
+    explicitUser: options.user,
+    sessionStore,
+  });
+
   if (!senderId) {
     throw new Error("缺少发送目标，传 --user 或配置 CODEKSEI_ALLOWED_USER_IDS（或旧的 CYBERBOSS_ALLOWED_USER_IDS）");
   }
-
-  const queue = new TimelineScreenshotQueueStore({ filePath: config.timelineScreenshotQueueFile });
-  const queued = queue.enqueue({
-    id: crypto.randomUUID(),
-    accountId: account.accountId,
-    senderId,
-    outputFile: options.outputFile,
-    args: options.forwardArgs,
-    createdAt: new Date().toISOString(),
-  });
-
+
+  const queue = new TimelineScreenshotQueueStore({ filePath: config.timelineScreenshotQueueFile });
+  const queued = queue.enqueue({
+    id: crypto.randomUUID(),
+    accountId: account.accountId,
+    senderId,
+    outputFile: options.outputFile,
+    args: options.forwardArgs,
+    createdAt: new Date().toISOString(),
+  });
+
   console.log(`timeline screenshot queued: ${queued.id}`);
   console.log("delivery_status: pending_bridge_send");
 }
-
-function parseTimelineScreenshotArgs(args) {
-  const options = {
-    help: false,
-    user: "",
-    outputFile: "",
-    forwardArgs: [],
-  };
-
-  for (let index = 0; index < args.length; index += 1) {
-    const token = String(args[index] || "").trim();
-    if (!token) {
-      continue;
-    }
-    if (token === "--help" || token === "-h") {
-      options.help = true;
-      continue;
-    }
-    if (token === "--send") {
-      continue;
-    }
-    if (token === "--user") {
-      const value = String(args[index + 1] || "").trim();
-      if (!value || value.startsWith("--")) {
-        throw new Error("参数缺少值: --user");
-      }
-      options.user = value;
-      index += 1;
-      continue;
-    }
-    if (token === "--output") {
-      const value = String(args[index + 1] || "").trim();
-      if (!value || value.startsWith("--")) {
-        throw new Error("参数缺少值: --output");
-      }
-      options.outputFile = path.resolve(value);
-      index += 1;
-      continue;
-    }
-
-    options.forwardArgs.push(token);
-    const next = String(args[index + 1] || "").trim();
-    if (token.startsWith("--") && next && !next.startsWith("--")) {
-      options.forwardArgs.push(next);
-      index += 1;
-    }
-  }
-
-  return options;
-}
-
-function printTimelineScreenshotHelp() {
-  console.log(`
-用法: npm run timeline:screenshot -- --send [--user <wechatUserId>] [--output /绝对路径] [其他 timeline screenshot 参数]
-
+
+function parseTimelineScreenshotArgs(args) {
+  const options = {
+    help: false,
+    user: "",
+    outputFile: "",
+    forwardArgs: [],
+  };
+
+  for (let index = 0; index < args.length; index += 1) {
+    const token = String(args[index] || "").trim();
+    if (!token) {
+      continue;
+    }
+    if (token === "--help" || token === "-h") {
+      options.help = true;
+      continue;
+    }
+    if (token === "--send") {
+      continue;
+    }
+    if (token === "--demo") {
+      continue;
+    }
+    if (token === "--user") {
+      const value = String(args[index + 1] || "").trim();
+      if (!value || value.startsWith("--")) {
+        throw new Error("参数缺少值: --user");
+      }
+      options.user = value;
+      index += 1;
+      continue;
+    }
+    if (token === "--output") {
+      const value = String(args[index + 1] || "").trim();
+      if (!value || value.startsWith("--")) {
+        throw new Error("参数缺少值: --output");
+      }
+      options.outputFile = path.resolve(value);
+      index += 1;
+      continue;
+    }
+
+    options.forwardArgs.push(token);
+    const next = String(args[index + 1] || "").trim();
+    if (token.startsWith("--") && next && !next.startsWith("--")) {
+      options.forwardArgs.push(next);
+      index += 1;
+    }
+  }
+
+  return options;
+}
+
+function printTimelineScreenshotHelp() {
+  console.log(`
+用法: npm run timeline:screenshot -- --send [--user <wechatUserId>] [--output /绝对路径] [其他 timeline screenshot 参数]
+
 说明:
   这条命令只负责把截图任务排进本地队列，真正截图和发送由正在运行的微信 bridge 异步执行。
   queued 不等于“已经发到微信”；只有 bridge 真正送达后，用户那边才会看到图片或文件。
-
-示例:
-  npm run timeline:screenshot -- --send --selector timeline
-`);
-}
-
-module.exports = {
-  runTimelineScreenshotCommand,
-  parseTimelineScreenshotArgs,
-};
+
+示例:
+  npm run timeline:screenshot -- --send --selector timeline
+`);
+}
+
+module.exports = {
+  runTimelineScreenshotCommand,
+  parseTimelineScreenshotArgs,
+};