helloloop 0.8.5 → 0.9.1

package/src/engine_selection_settings.mjs

@@ -24,6 +24,15 @@ function defaultEmailNotificationSettings() {
   };
 }
 
+function defaultTerminalConcurrencySettings() {
+  return {
+    enabled: true,
+    visibleMax: 8,
+    backgroundMax: 8,
+    totalMax: 8,
+  };
+}
+
 function defaultUserSettings() {
   return {
     defaultEngine: "",
@@ -31,28 +40,40 @@ function defaultUserSettings() {
     notifications: {
       email: defaultEmailNotificationSettings(),
     },
+    runtime: {
+      terminalConcurrency: defaultTerminalConcurrencySettings(),
+    },
   };
 }
 
-function cloneJsonValue(value) {
-  return JSON.parse(JSON.stringify(value));
-}
-
 function isPlainObject(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 
-function syncValueBySchema(schemaValue, currentValue) {
-  if (!isPlainObject(schemaValue)) {
-    return currentValue === undefined ? cloneJsonValue(schemaValue) : currentValue;
-  }
+function normalizeString(value, fallback = "") {
+  return typeof value === "string" ? value.trim() : fallback;
+}
 
-  const source = isPlainObject(currentValue) ? currentValue : {};
-  const next = {};
-  for (const [key, childSchema] of Object.entries(schemaValue)) {
-    next[key] = syncValueBySchema(childSchema, Object.hasOwn(source, key) ? source[key] : undefined);
+function normalizeBoolean(value, fallback = false) {
+  return typeof value === "boolean" ? value : fallback;
+}
+
+function normalizePositiveInteger(value, fallback, minimum = 1) {
+  const numericValue = Number(value);
+  if (!Number.isInteger(numericValue) || numericValue < minimum) {
+    return fallback;
   }
-  return next;
+  return numericValue;
+}
+
+function normalizeTerminalConcurrencySettings(settings = {}) {
+  const defaults = defaultTerminalConcurrencySettings();
+  return {
+    enabled: normalizeBoolean(settings?.enabled, defaults.enabled),
+    visibleMax: normalizePositiveInteger(settings?.visibleMax, defaults.visibleMax, 0),
+    backgroundMax: normalizePositiveInteger(settings?.backgroundMax, defaults.backgroundMax, 0),
+    totalMax: normalizePositiveInteger(settings?.totalMax, defaults.totalMax, 0),
+  };
 }
 
 function mergeValueBySchema(schemaValue, baseValue, patchValue) {
@@ -75,16 +96,6 @@ function mergeValueBySchema(schemaValue, baseValue, patchValue) {
   return next;
 }
 
-export function syncUserSettingsShape(settings = {}) {
-  return syncValueBySchema(defaultUserSettings(), settings);
-}
-
-function readRawUserSettingsDocument(options = {}) {
-  const settingsFile = resolveUserSettingsFile(options.userSettingsFile);
-  const settings = fileExists(settingsFile) ? readJson(settingsFile) : {};
-  return syncUserSettingsShape(settings);
-}
-
 export function resolveUserSettingsHome() {
   return String(process.env.HELLOLOOP_HOME || "").trim()
     || path.join(os.homedir(), ".helloloop");
@@ -101,32 +112,49 @@ function normalizeEmailNotificationSettings(emailSettings = {}) {
   const smtp = emailSettings?.smtp || {};
 
   return {
-    ...defaults,
-    ...emailSettings,
+    enabled: normalizeBoolean(emailSettings?.enabled, defaults.enabled),
     to: Array.isArray(emailSettings?.to)
       ? emailSettings.to.map((item) => String(item || "").trim()).filter(Boolean)
-      : (typeof emailSettings?.to === "string" && emailSettings.to.trim() ? [emailSettings.to.trim()] : []),
+      : defaults.to,
+    from: normalizeString(emailSettings?.from, defaults.from),
     smtp: {
-      ...defaults.smtp,
-      ...smtp,
+      host: normalizeString(smtp?.host, defaults.smtp.host),
+      port: normalizePositiveInteger(smtp?.port, defaults.smtp.port),
+      secure: normalizeBoolean(smtp?.secure, defaults.smtp.secure),
+      starttls: normalizeBoolean(smtp?.starttls, defaults.smtp.starttls),
+      username: normalizeString(smtp?.username, defaults.smtp.username),
+      usernameEnv: normalizeString(smtp?.usernameEnv, defaults.smtp.usernameEnv),
+      password: typeof smtp?.password === "string" ? smtp.password : defaults.smtp.password,
+      passwordEnv: normalizeString(smtp?.passwordEnv, defaults.smtp.passwordEnv),
+      timeoutSeconds: normalizePositiveInteger(smtp?.timeoutSeconds, defaults.smtp.timeoutSeconds),
+      rejectUnauthorized: normalizeBoolean(smtp?.rejectUnauthorized, defaults.smtp.rejectUnauthorized),
     },
   };
 }
 
-export function loadUserSettingsDocument(options = {}) {
-  const settings = readRawUserSettingsDocument(options);
-
+export function syncUserSettingsShape(settings = {}) {
   return {
-    ...settings,
-    defaultEngine: normalizeEngineName(settings?.defaultEngine),
-    lastSelectedEngine: normalizeEngineName(settings?.lastSelectedEngine),
+    defaultEngine: normalizeEngineName(settings?.defaultEngine) || "",
+    lastSelectedEngine: normalizeEngineName(settings?.lastSelectedEngine) || "",
     notifications: {
-      ...(settings?.notifications || {}),
       email: normalizeEmailNotificationSettings(settings?.notifications?.email || {}),
     },
+    runtime: {
+      terminalConcurrency: normalizeTerminalConcurrencySettings(settings?.runtime?.terminalConcurrency || {}),
+    },
   };
 }
 
+function readRawUserSettingsDocument(options = {}) {
+  const settingsFile = resolveUserSettingsFile(options.userSettingsFile);
+  const settings = fileExists(settingsFile) ? readJson(settingsFile) : {};
+  return syncUserSettingsShape(settings);
+}
+
+export function loadUserSettingsDocument(options = {}) {
+  return readRawUserSettingsDocument(options);
+}
+
 export function loadUserSettings(options = {}) {
   const settings = loadUserSettingsDocument(options);
   return {

package/src/install_codex.mjs

@@ -133,7 +133,6 @@ export function installCodexHost(bundleRoot, options = {}) {
   const resolvedLocalRoot = resolveCodexLocalRoot(options.codexHome);
   const targetPluginsRoot = path.join(resolvedLocalRoot, "plugins");
   const targetPluginRoot = path.join(targetPluginsRoot, CODEX_PLUGIN_NAME);
-  const legacyTargetPluginRoot = path.join(resolvedCodexHome, "plugins", CODEX_PLUGIN_NAME);
   const targetPluginCacheRoot = path.join(
     resolvedCodexHome,
     "plugins",
@@ -143,13 +142,9 @@ export function installCodexHost(bundleRoot, options = {}) {
   );
   const targetInstalledPluginRoot = path.join(targetPluginCacheRoot, "local");
   const marketplaceFile = path.join(resolvedLocalRoot, ".agents", "plugins", "marketplace.json");
-  const legacyMarketplaceFile = path.join(resolvedCodexHome, ".agents", "plugins", "marketplace.json");
   const configFile = path.join(resolvedCodexHome, "config.toml");
   const manifestFile = path.join(bundleRoot, ".codex-plugin", "plugin.json");
   const existingMarketplace = readExistingJsonOrThrow(marketplaceFile, "Codex marketplace 配置");
-  const existingLegacyMarketplace = legacyMarketplaceFile === marketplaceFile
-    ? existingMarketplace
-    : readExistingJsonOrThrow(legacyMarketplaceFile, "Codex legacy marketplace 配置");
 
   if (!fileExists(manifestFile)) {
     throw new Error(`未找到 Codex 插件 manifest：${manifestFile}`);
@@ -159,9 +154,6 @@ export function installCodexHost(bundleRoot, options = {}) {
   assertPathInside(resolvedCodexHome, targetPluginCacheRoot, "Codex 插件缓存目录");
   removeTargetIfNeeded(targetPluginRoot, options.force);
   removeTargetIfNeeded(targetPluginCacheRoot, options.force);
-  if (legacyTargetPluginRoot !== targetPluginRoot) {
-    removePathIfExists(legacyTargetPluginRoot);
-  }
 
   ensureDir(targetPluginsRoot);
   ensureDir(targetPluginRoot);
@@ -173,9 +165,6 @@ export function installCodexHost(bundleRoot, options = {}) {
 
   ensureDir(path.dirname(marketplaceFile));
   updateCodexMarketplace(marketplaceFile, existingMarketplace);
-  if (legacyMarketplaceFile !== marketplaceFile) {
-    removeCodexMarketplaceEntry(legacyMarketplaceFile, existingLegacyMarketplace);
-  }
   upsertCodexPluginConfig(configFile);
 
   return {
@@ -192,7 +181,6 @@ export function uninstallCodexHost(options = {}) {
   const resolvedCodexHome = resolveHomeDir(options.codexHome, ".codex");
   const resolvedLocalRoot = resolveCodexLocalRoot(options.codexHome);
   const targetPluginRoot = path.join(resolvedLocalRoot, "plugins", CODEX_PLUGIN_NAME);
-  const legacyTargetPluginRoot = path.join(resolvedCodexHome, "plugins", CODEX_PLUGIN_NAME);
   const targetPluginCacheRoot = path.join(
     resolvedCodexHome,
     "plugins",
@@ -201,29 +189,19 @@ export function uninstallCodexHost(options = {}) {
     CODEX_PLUGIN_NAME,
   );
   const marketplaceFile = path.join(resolvedLocalRoot, ".agents", "plugins", "marketplace.json");
-  const legacyMarketplaceFile = path.join(resolvedCodexHome, ".agents", "plugins", "marketplace.json");
   const configFile = path.join(resolvedCodexHome, "config.toml");
   const existingMarketplace = readExistingJsonOrThrow(marketplaceFile, "Codex marketplace 配置");
-  const existingLegacyMarketplace = legacyMarketplaceFile === marketplaceFile
-    ? existingMarketplace
-    : readExistingJsonOrThrow(legacyMarketplaceFile, "Codex legacy marketplace 配置");
 
   const removedPlugin = removePathIfExists(targetPluginRoot);
-  const removedLegacyPlugin = legacyTargetPluginRoot === targetPluginRoot
-    ? false
-    : removePathIfExists(legacyTargetPluginRoot);
   const removedCache = removePathIfExists(targetPluginCacheRoot);
   const removedMarketplace = removeCodexMarketplaceEntry(marketplaceFile, existingMarketplace);
-  const removedLegacyMarketplace = legacyMarketplaceFile === marketplaceFile
-    ? false
-    : removeCodexMarketplaceEntry(legacyMarketplaceFile, existingLegacyMarketplace);
   const removedConfig = removeCodexPluginConfig(configFile);
 
   return {
     host: "codex",
     displayName: "Codex",
     targetRoot: targetPluginRoot,
-    removed: removedPlugin || removedLegacyPlugin || removedCache || removedMarketplace || removedLegacyMarketplace || removedConfig,
+    removed: removedPlugin || removedCache || removedMarketplace || removedConfig,
     marketplaceFile,
     configFile,
   };

package/src/runner_execute_task.mjs

@@ -4,7 +4,7 @@ import { rememberEngineSelection } from "./engine_selection.mjs";
 import { getEngineDisplayName } from "./engine_metadata.mjs";
 import { ensureDir, nowIso, writeText } from "./common.mjs";
 import { isHostLeaseAlive } from "./host_lease.mjs";
-import { saveBacklog } from "./config.mjs";
+import { saveBacklog, writeStatus } from "./config.mjs";
 import { reviewTaskCompletion } from "./completion_review.mjs";
 import { updateTask } from "./backlog.mjs";
 import { buildTaskPrompt } from "./prompt.mjs";
@@ -267,6 +267,16 @@ export async function executeSingleTask(context, options = {}) {
 
   updateTask(execution.backlog, execution.task.id, { status: "in_progress", startedAt: nowIso() });
   saveBacklog(context, execution.backlog);
+  writeStatus(context, {
+    ok: true,
+    sessionId: options.supervisorSessionId || "",
+    stage: "task-started",
+    taskId: execution.task.id,
+    taskTitle: execution.task.title,
+    runDir: execution.runDir,
+    summary: "",
+    message: `开始执行任务：${execution.task.title}`,
+  });
 
   const state = {
     engineResolution: execution.engineResolution,

package/src/runner_once.mjs

@@ -11,6 +11,7 @@ export async function runOnce(context, options = {}) {
 
   writeStatus(context, {
     ok: result.ok,
+    sessionId: options.supervisorSessionId || "",
     stage: result.kind,
     taskId: result.task?.id || null,
     taskTitle: result.task?.title || "",

package/src/runner_status.mjs

@@ -90,6 +90,9 @@ export function renderStatusText(context, options = {}) {
   const supervisor = fileExists(context.supervisorStateFile)
     ? readJson(context.supervisorStateFile)
     : null;
+  const latestStatus = fileExists(context.statusFile)
+    ? readJson(context.statusFile)
+    : null;
 
   return [
     "HelloLoop 状态",
@@ -108,8 +111,17 @@ export function renderStatusText(context, options = {}) {
         `后台租约：${renderHostLeaseLabel(supervisor.lease)}`,
       ]
       : []),
+    ...(latestStatus?.taskTitle
+      ? [
+        `当前运行任务：${latestStatus.taskTitle}`,
+        `当前运行目录：${latestStatus.runDir || "unknown"}`,
+        `当前运行阶段：${latestStatus.stage || "unknown"}`,
+      ]
+      : []),
     "",
     nextTask ? "下一任务：" : "下一任务：无",
     nextTask ? renderTaskSummary(nextTask) : "",
+    "",
+    "实时观察：helloloop watch",
   ].filter(Boolean).join("\n");
 }

package/src/runtime_engine_support.mjs

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 
-import { nowIso, writeText } from "./common.mjs";
+import { appendText, nowIso, writeText } from "./common.mjs";
 import { getEngineDisplayName } from "./engine_metadata.mjs";
 import {
   buildClaudeArgs,
@@ -165,6 +165,8 @@ export async function runEngineAttempt({
 }) {
   const attemptPromptFile = path.join(runDir, `${attemptPrefix}-prompt.md`);
   const attemptLastMessageFile = path.join(runDir, `${attemptPrefix}-last-message.txt`);
+  const attemptStdoutFile = path.join(runDir, `${attemptPrefix}-stdout.log`);
+  const attemptStderrFile = path.join(runDir, `${attemptPrefix}-stderr.log`);
 
   if (invocation.error) {
     const result = {
@@ -208,6 +210,8 @@ export async function runEngineAttempt({
     recoveryCount,
     recoveryHistory,
   });
+  writeText(attemptStdoutFile, "");
+  writeText(attemptStderrFile, "");
 
   const result = await runChild(invocation.command, finalArgs, {
     cwd: context.repoRoot,
@@ -226,6 +230,12 @@ export async function runEngineAttempt({
         heartbeat: payload,
       });
     },
+    onStdout(text) {
+      appendText(attemptStdoutFile, text);
+    },
+    onStderr(text) {
+      appendText(attemptStderrFile, text);
+    },
     shouldKeepRunning() {
       return isHostLeaseAlive(hostLease);
     },

package/src/supervisor_cli_support.mjs

@@ -0,0 +1,48 @@
+import { launchSupervisedCommand, renderSupervisorLaunchSummary } from "./supervisor_runtime.mjs";
+import { watchSupervisorSession } from "./supervisor_watch.mjs";
+
+export function shouldUseSupervisor(options = {}) {
+  return !options.dryRun
+    && process.env.HELLOLOOP_SUPERVISOR_ACTIVE !== "1";
+}
+
+export function shouldAutoWatchSupervisor(options = {}) {
+  if (options.detach) {
+    return false;
+  }
+  if (options.watch === true) {
+    return true;
+  }
+  if (options.watch === false) {
+    return false;
+  }
+  return Boolean(process.stdout.isTTY);
+}
+
+export async function launchAndMaybeWatchSupervisedCommand(context, command, options = {}) {
+  const session = launchSupervisedCommand(context, command, options);
+  console.log(renderSupervisorLaunchSummary(session));
+
+  if (!shouldAutoWatchSupervisor(options)) {
+    console.log("- 已切换为后台执行；可稍后运行 `helloloop watch` 或 `helloloop status` 查看进度。");
+    return {
+      detached: true,
+      exitCode: 0,
+      ok: true,
+      session,
+    };
+  }
+
+  console.log("- 已进入附着观察模式；按 Ctrl+C 仅退出观察，不会停止后台任务。");
+  const watchResult = await watchSupervisorSession(context, {
+    sessionId: session.sessionId,
+    pollMs: options.watchPollMs,
+  });
+  return {
+    detached: false,
+    exitCode: watchResult.exitCode,
+    ok: watchResult.ok,
+    session,
+    watchResult,
+  };
+}

package/src/supervisor_runtime.mjs

@@ -6,6 +6,12 @@ import { createContext } from "./context.mjs";
 import { nowIso, readJson, writeJson, readTextIfExists, timestampForFile } from "./common.mjs";
 import { isHostLeaseAlive, renderHostLeaseLabel, resolveHostLease } from "./host_lease.mjs";
 import { runLoop, runOnce } from "./runner.mjs";
+import {
+  bindBackgroundTerminalSession,
+  cancelPreparedTerminalSessionBackground,
+  finalizePreparedTerminalSessionBackground,
+  prepareCurrentTerminalSessionForBackground,
+} from "./terminal_session_limits.mjs";
 
 const ACTIVE_STATUSES = new Set(["launching", "running"]);
 const FINAL_STATUSES = new Set(["completed", "failed", "stopped"]);
@@ -78,6 +84,11 @@ export function launchSupervisedCommand(context, command, options = {}) {
 
   const sessionId = timestampForFile();
   const lease = resolveHostLease({ hostContext: options.hostContext });
+  const terminalSession = prepareCurrentTerminalSessionForBackground({
+    command,
+    repoRoot: context.repoRoot,
+    sessionId,
+  });
   const request = {
     sessionId,
     command,
@@ -85,8 +96,12 @@ export function launchSupervisedCommand(context, command, options = {}) {
       repoRoot: context.repoRoot,
       configDirName: context.configDirName,
     },
-    options: toSerializableOptions(options),
+    options: toSerializableOptions({
+      ...options,
+      supervisorSessionId: sessionId,
+    }),
     lease,
+    terminalSessionFile: terminalSession?.file || "",
   };
 
   fs.mkdirSync(context.supervisorRoot, { recursive: true });
@@ -122,6 +137,11 @@ export function launchSupervisedCommand(context, command, options = {}) {
         HELLOLOOP_SUPERVISOR_ACTIVE: "1",
       },
     });
+    finalizePreparedTerminalSessionBackground(child.pid ?? 0, {
+      command,
+      repoRoot: context.repoRoot,
+      sessionId,
+    });
     child.unref();
     writeState(context, {
       sessionId,
@@ -137,6 +157,13 @@ export function launchSupervisedCommand(context, command, options = {}) {
       pid: child.pid ?? 0,
       lease,
     };
+  } catch (error) {
+    cancelPreparedTerminalSessionBackground({
+      command,
+      repoRoot: context.repoRoot,
+      sessionId,
+    });
+    throw error;
   } finally {
     fs.closeSync(stdoutFd);
     fs.closeSync(stderrFd);
@@ -184,6 +211,11 @@ export async function runSupervisedCommandFromSessionFile(sessionFile) {
   const context = createContext(request.context || {});
   const command = String(request.command || "").trim();
   const lease = request.lease || {};
+  bindBackgroundTerminalSession(request.terminalSessionFile || "", {
+    command,
+    repoRoot: context.repoRoot,
+    sessionId: request.sessionId,
+  });
   const commandOptions = {
     ...(request.options || {}),
     hostLease: lease,