helloagents 3.0.35 → 3.0.38

package/scripts/session-token.mjs

@@ -17,6 +17,19 @@ const PAYLOAD_SESSION_KEYS = [
   'tab',
 ]
 
+const PROJECT_PAYLOAD_SESSION_KEYS = [
+  'sessionId',
+  'session_id',
+  'session',
+  'conversationId',
+  'conversation_id',
+  'conversation',
+  'threadId',
+  'thread_id',
+  'thread-id',
+  'thread',
+]
+
 const ENV_SESSION_KEYS = [
   'HELLOAGENTS_NOTIFY_SESSION_ID',
   'WT_SESSION',
@@ -28,6 +41,21 @@ const ENV_SESSION_KEYS = [
   'TAB_ID',
 ]
 
+const PROJECT_ENV_SESSION_KEYS = [
+  'HELLOAGENTS_NOTIFY_SESSION_ID',
+]
+
+const PROJECT_ALIAS_ENV_SESSION_KEYS = [
+  'HELLOAGENTS_NOTIFY_SESSION_ID',
+  'WT_SESSION',
+  'TERM_SESSION_ID',
+  'KITTY_WINDOW_ID',
+  'ALACRITTY_WINDOW_ID',
+  'WINDOWID',
+  'WEZTERM_PANE',
+  'TAB_ID',
+]
+
 function readStringCandidate(input, key) {
   if (!input || typeof input !== 'object') return ''
   const value = input[key]
@@ -50,23 +78,48 @@ export function sanitizeSessionToken(value = '') {
   return cleaned.slice(0, 8)
 }
 
+function resolveTokenFromKeys(input, keys = []) {
+  for (const key of keys) {
+    const value = sanitizeSessionToken(readStringCandidate(input, key))
+    if (value) return value
+  }
+  return ''
+}
+
 export function resolveSessionToken({
   payload = {},
   env = process.env,
   ppid = process.ppid,
   allowPpidFallback = true,
 } = {}) {
-  for (const key of PAYLOAD_SESSION_KEYS) {
-    const value = sanitizeSessionToken(readStringCandidate(payload, key))
-    if (value) return value
-  }
+  const payloadToken = resolveTokenFromKeys(payload, PAYLOAD_SESSION_KEYS)
+  if (payloadToken) return payloadToken
 
-  for (const key of ENV_SESSION_KEYS) {
-    const value = sanitizeSessionToken(env?.[key] || '')
-    if (value) return value
-  }
+  const envToken = resolveTokenFromKeys(env, ENV_SESSION_KEYS)
+  if (envToken) return envToken
 
   return allowPpidFallback && ppid ? String(ppid) : ''
 }
 
-export { ENV_SESSION_KEYS, PAYLOAD_SESSION_KEYS }
+export function resolveProjectSessionToken({
+  payload = {},
+  env = process.env,
+} = {}) {
+  const payloadToken = resolveTokenFromKeys(payload, PROJECT_PAYLOAD_SESSION_KEYS)
+  if (payloadToken) return payloadToken
+  return resolveTokenFromKeys(env, PROJECT_ENV_SESSION_KEYS)
+}
+
+export function resolveProjectSessionAliasToken({
+  env = process.env,
+} = {}) {
+  return resolveTokenFromKeys(env, PROJECT_ALIAS_ENV_SESSION_KEYS)
+}
+
+export {
+  ENV_SESSION_KEYS,
+  PAYLOAD_SESSION_KEYS,
+  PROJECT_ALIAS_ENV_SESSION_KEYS,
+  PROJECT_ENV_SESSION_KEYS,
+  PROJECT_PAYLOAD_SESSION_KEYS,
+}

package/scripts/state-document.mjs

@@ -3,6 +3,7 @@ import { dirname } from 'node:path'
 
 const STATE_META_BEGIN = '<!-- HELLOAGENTS_STATE_META'
 const STATE_META_END = 'HELLOAGENTS_STATE_META -->'
+export const AUTO_CREATED_STATE_MARKER = '由运行时自动创建；后续按实际任务重写'
 
 function normalizeText(content = '') {
   return String(content || '').replace(/^\uFEFF/, '')
@@ -62,13 +63,11 @@ export function readStateDocument(filePath) {
 
 export function composeStateDocument({ metadata = {}, body = '' } = {}) {
   const normalizedBody = normalizeText(body).replace(/^\n+/, '')
-  return [
-    STATE_META_BEGIN,
-    JSON.stringify(metadata, null, 2),
-    STATE_META_END,
-    '',
-    normalizedBody,
-  ].join('\n').replace(/\n+$/, '\n')
+  return normalizedBody ? `${normalizedBody.replace(/\n+$/, '')}\n` : ''
+}
+
+export function looksLikeAutoCreatedState(body = '') {
+  return normalizeText(body).includes(AUTO_CREATED_STATE_MARKER)
 }
 
 export function writeStateDocument(filePath, { metadata = {}, body = '' } = {}) {

package/scripts/turn-state.mjs

@@ -5,7 +5,6 @@ import { fileURLToPath } from 'node:url'
 import {
   appendSessionEvent,
   clearCapsuleSection,
-  getSessionCapsulePath,
   getRuntimeScope,
   readCapsuleSection,
   writeCapsuleSection,
@@ -108,7 +107,7 @@ export function readTurnState(cwd = process.cwd(), { now = Date.now(), ...option
   return {
     cwd: normalizePath(entry.cwd),
     key: entry.key || '',
-    path: getSessionCapsulePath(cwd, options),
+    path: getRuntimeScope(cwd, options).statePath,
     updatedAt: entry.updatedAt,
     ...normalized,
   }
@@ -288,7 +287,7 @@ function main() {
     const payload = writeTurnState(cwd, input)
     process.stdout.write(JSON.stringify({
       suppressOutput: true,
-      path: getSessionCapsulePath(cwd, input),
+      path: getRuntimeScope(cwd, input).statePath,
       payload,
     }))
     return

package/scripts/workflow-core.mjs

@@ -15,10 +15,7 @@ export function getTargetPlans(snapshot) {
 }
 
 function describeStateLabel(state) {
-  if (state.stateSessionMode === 'default') {
-    return '当前工作区默认位置的状态文件'
-  }
-  return '当前会话的状态文件'
+  return '当前工作区状态文件'
 }
 
 export function classifyPlan(plan) {

package/scripts/workflow-plan-files.mjs

@@ -188,7 +188,7 @@ export function readStateSnapshot(cwd, options = {}) {
     stateSessionToken: stateScope.stateSessionToken,
     stateSessionMode: stateScope.stateSessionMode,
     stateWorkspace: stateScope.stateWorkspace,
-    sessionScoped: stateScope.stateScope === 'session',
+    sessionScoped: true,
     exists,
     content,
     sections,