typeclaw 0.36.4 → 0.36.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typeclaw",
-  "version": "0.36.4",
+  "version": "0.36.5",
   "homepage": "https://github.com/typeclaw/typeclaw#readme",
   "bugs": {
     "url": "https://github.com/typeclaw/typeclaw/issues"
@@ -48,7 +48,7 @@
     "@mariozechner/pi-tui": "^0.67.3",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "@mozilla/readability": "^0.6.0",
-    "agent-messenger": "2.19.4",
+    "agent-messenger": "2.19.5",
     "cheerio": "^1.2.0",
     "citty": "^0.2.2",
     "cron-parser": "^5.5.0",

package/src/config/config.ts

@@ -25,6 +25,26 @@ const knownModelRefs = listKnownModelRefs() as [KnownModelRef, ...KnownModelRef[
 // T9 keypad: T=8, Y=9, P=7, E=3
 const DEFAULT_PORT = 8973
 
+export const GWS_MULTI_ACCOUNT_PLUGIN_PACKAGE = 'typeclaw-gws-multi-account'
+export const GWS_MULTI_ACCOUNT_PLUGIN_VERSION = '^0.3.4'
+export const DEFAULT_PLUGINS = [`${GWS_MULTI_ACCOUNT_PLUGIN_PACKAGE}@${GWS_MULTI_ACCOUNT_PLUGIN_VERSION}`] as const
+
+export function withDefaultPlugins(plugins: readonly string[]): string[] {
+  const configuredNames = new Set(plugins.map(pluginPackageName))
+  const defaults = DEFAULT_PLUGINS.filter((entry) => !configuredNames.has(pluginPackageName(entry)))
+  return [...defaults, ...plugins]
+}
+
+function pluginPackageName(entry: string): string {
+  if (entry.startsWith('@')) {
+    const slash = entry.indexOf('/')
+    const at = slash === -1 ? -1 : entry.indexOf('@', slash + 1)
+    return at === -1 ? entry : entry.slice(0, at)
+  }
+  const at = entry.indexOf('@')
+  return at === -1 ? entry : entry.slice(0, at)
+}
+
 // Mount names land on disk as `mounts/<name>` inside the agent folder, so they
 // share a namespace with regular filenames. Restricting to lowercase
 // alphanumerics + `-`/`_` keeps them shell-safe and avoids accidental shadowing

package/src/config/index.ts

@@ -2,6 +2,7 @@ export {
   buildConfigMigrationCommitMessage,
   config,
   configSchema,
+  DEFAULT_PLUGINS,
   dockerSchema,
   dockerfileSchema,
   expandMountPath,
@@ -9,6 +10,8 @@ export {
   getConfig,
   gitSchema,
   gitignoreSchema,
+  GWS_MULTI_ACCOUNT_PLUGIN_PACKAGE,
+  GWS_MULTI_ACCOUNT_PLUGIN_VERSION,
   loadConfigSync,
   loadConfigSyncOrDefaults,
   loadPluginConfigsSync,
@@ -22,6 +25,7 @@ export {
   resolveProfile,
   validateConfig,
   validateMount,
+  withDefaultPlugins,
   type Config,
   type ConfigChange,
   type ConfigReloadDiff,

package/src/container/start.ts

@@ -3,7 +3,7 @@ import { existsSync } from 'node:fs'
 import { readFile, writeFile } from 'node:fs/promises'
 import { isAbsolute, join, resolve } from 'node:path'
 
-import { expandMountPath, loadConfigSync, type Config } from '@/config'
+import { expandMountPath, loadConfigSync, withDefaultPlugins, type Config } from '@/config'
 import { commitGitignoreWithUntracks, untrackTrulyIgnoredFiles } from '@/git/reconcile-ignored'
 import { commitSystemFile as commitSystemFileShared } from '@/git/system-commit'
 import { send as sendToDaemon } from '@/hostd/client'
@@ -263,7 +263,7 @@ export async function start({
     // field is trustworthy by construction.
     const pluginReconcile = await reconcilePluginDeps({
       cwd,
-      plugins: (await loadTypeclawConfig(cwd)).plugins,
+      plugins: withDefaultPlugins((await loadTypeclawConfig(cwd)).plugins),
     }).catch((error: unknown) => ({ error: error instanceof Error ? error.message : String(error) }) as const)
     if ('error' in pluginReconcile) {
       return { ok: false, reason: `plugin dependency reconcile failed: ${pluginReconcile.error}` }

package/src/init/index.ts

@@ -3,7 +3,14 @@ import { mkdir, readFile, writeFile } from 'node:fs/promises'
 import { basename, dirname, join, relative, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
-import { config, configSchema, migrateLegacyConfigShape, type Config } from '@/config'
+import {
+  config,
+  configSchema,
+  GWS_MULTI_ACCOUNT_PLUGIN_PACKAGE,
+  GWS_MULTI_ACCOUNT_PLUGIN_VERSION,
+  migrateLegacyConfigShape,
+  type Config,
+} from '@/config'
 import {
   DEFAULT_MODEL_REF,
   KNOWN_PROVIDERS,
@@ -577,7 +584,6 @@ export async function scaffold(root: string, options: ScaffoldOptions = {}): Pro
 // to function. The Dockerfile pre-downloads Chromium too, so the agent
 // can drive a browser without any first-run setup.
 const AGENT_BROWSER_VERSION = '^0.26.0'
-
 function buildPackageJson(root: string, name: string): Record<string, unknown> {
   return {
     name,
@@ -587,6 +593,12 @@ function buildPackageJson(root: string, name: string): Record<string, unknown> {
     dependencies: {
       typeclaw: resolveTypeclawSpec(root),
       'agent-browser': AGENT_BROWSER_VERSION,
+      [GWS_MULTI_ACCOUNT_PLUGIN_PACKAGE]: GWS_MULTI_ACCOUNT_PLUGIN_VERSION,
+    },
+    typeclaw: {
+      managedPlugins: {
+        [GWS_MULTI_ACCOUNT_PLUGIN_PACKAGE]: GWS_MULTI_ACCOUNT_PLUGIN_VERSION,
+      },
     },
   }
 }

package/src/init/line-auth.ts

@@ -44,6 +44,8 @@ export type LineLoginClient = {
   }): Promise<LineLoginResult>
 }
 
+let lineTokenInfoSuppressionQueue: Promise<void> = Promise.resolve()
+
 export function lineSecretsPath(agentDir: string): string {
   return join(agentDir, 'secrets.json')
 }
@@ -58,19 +60,20 @@ export async function runLineBootstrap(input: LineLoginInput): Promise<LineBoots
     // ~/.config/agent-messenger to keep in sync.
     const client = input.client ?? buildLineClient(store)
 
-    const result =
+    const result = await suppressLineTokenInfoDump(() =>
       input.method === 'qr'
-        ? await client.loginWithQR({
+        ? client.loginWithQR({
             onQRUrl: async (url) => {
               await input.callbacks.onQRUrl?.(url)
             },
             onPincode: input.callbacks.onPincode,
           })
-        : await client.loginWithEmail({
+        : client.loginWithEmail({
             email: input.email,
             password: input.password,
             onPincode: input.callbacks.onPincode,
-          })
+          }),
+    )
 
     if (!result.authenticated || result.account_id === undefined) {
       const reason = result.message ?? result.error ?? 'LINE login did not authenticate'
@@ -101,3 +104,45 @@ function buildLineClient(store: SecretsLineCredentialStore): LineLoginClient {
   const credManager = store as unknown as LineCredentialManager
   return new RealLineClient(credManager) as unknown as LineLoginClient
 }
+
+async function suppressLineTokenInfoDump<T>(fn: () => Promise<T>): Promise<T> {
+  const previous = lineTokenInfoSuppressionQueue
+  let release: () => void = () => {}
+  lineTokenInfoSuppressionQueue = new Promise((resolve) => {
+    release = resolve
+  })
+  await previous
+
+  const originalLog = console.log
+  console.log = (...args: unknown[]) => {
+    if (isLineTokenInfoDump(args)) return
+    originalLog(...args)
+  }
+  try {
+    return await fn()
+  } finally {
+    console.log = originalLog
+    release()
+  }
+}
+
+function isLineTokenInfoDump(args: unknown[]): boolean {
+  if (args.length !== 1) return false
+  const value = args[0]
+  if (value === null || typeof value !== 'object') return false
+
+  const record = value as Record<string, unknown>
+  return (
+    looksLikeJwt(record['1']) &&
+    looksLikeJwt(record['2']) &&
+    typeof record['3'] === 'number' &&
+    typeof record['4'] === 'object' &&
+    typeof record['5'] === 'string' &&
+    typeof record['6'] === 'number'
+  )
+}
+
+function looksLikeJwt(value: unknown): boolean {
+  if (typeof value !== 'string') return false
+  return /^[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+$/.test(value)
+}

package/src/run/index.ts

@@ -28,7 +28,14 @@ import {
   type SubagentCompletionBridge,
 } from '@/channels'
 import { createTunnelBridge, type TunnelBridge } from '@/channels/tunnel-bridge'
-import { createConfigReloadable, getConfig, loadConfigSync, loadPluginConfigsSync, reloadConfig } from '@/config'
+import {
+  createConfigReloadable,
+  getConfig,
+  loadConfigSync,
+  loadPluginConfigsSync,
+  reloadConfig,
+  withDefaultPlugins,
+} from '@/config'
 import {
   type CountStore,
   type CronConsumer,
@@ -162,7 +169,7 @@ export async function startAgent({
   }
   const mcpManagerOpt = mcpManager !== null ? { mcpManager } : {}
   const pluginsLoaded = await loadPlugins({
-    entries: cwdConfig.plugins,
+    entries: withDefaultPlugins(cwdConfig.plugins),
     agentDir: cwd,
     configsByName: pluginConfigsByName,
     bundled: BUNDLED_PLUGINS,