@moretea-labs/forge 1.6.0 → 1.7.1

package/src/cli/local-bridge/console-automations.ts

@@ -1,13 +1,10 @@
 import type { RepositoryRecord } from '../repositories/types';
-import { listAssistantRoutines } from '../../runtime/assistant/store';
-import { runAssistantRoutineNow } from '../../runtime/assistant/intent';
-import { getAssistantRoutineScheduleBinding, updateAssistantRoutineLifecycle } from '../../runtime/assistant/schedule-binding';
 import { getWorkContract } from '../../runtime/control-plane/facade';
 import { evaluateSchedule } from '../../runtime/workflow/schedules/engine';
 import { getSchedule, listOccurrences, listSchedules, saveSchedule } from '../../runtime/workflow/schedules/store';
 import type { RepositorySchedule, ScheduleOccurrence } from '../../runtime/workflow/schedules/types';
 
-export type ConsoleAutomationMode = 'browser_watch' | 'browser_keepalive' | 'continuation' | 'chatgpt_prompt' | 'routine' | 'schedule';
+export type ConsoleAutomationMode = 'browser_watch' | 'browser_keepalive' | 'continuation' | 'schedule';
 
 export interface ConsoleAutomationHistoryView {
   id: string;
@@ -20,12 +17,12 @@ export interface ConsoleAutomationHistoryView {
 
 export interface ConsoleAutomationView {
   id: string;
-  source: 'schedule' | 'routine';
+  source: 'schedule';
   repoId: string;
   repositoryName: string;
   name: string;
   summary?: string;
-  status: 'enabled' | 'paused' | 'attention' | 'disabled';
+  status: 'enabled' | 'paused' | 'attention' | 'completed' | 'disabled';
   schedule: string;
   timezone?: string;
   delivery?: string;
@@ -46,24 +43,34 @@ export interface ConsoleAutomationView {
   lastResult?: string;
   nextRunHint?: string;
   pausedReason?: string;
+  attentionMessage?: string;
   history: ConsoleAutomationHistoryView[];
   actions: Array<'run' | 'pause' | 'resume'>;
 }
 
-function dailyCronLabel(expression?: string): string | undefined {
-  const match = /^(\d{1,2})\s+(\d{1,2})\s+\*\s+\*\s+\*$/.exec(expression?.trim() ?? '');
-  if (!match) return undefined;
-  const minute = Number(match[1]);
-  const hour = Number(match[2]);
-  if (minute > 59 || hour > 23) return undefined;
-  return `每天 ${String(hour).padStart(2, '0')}:${String(minute).padStart(2, '0')}`;
+function cronLabel(expression?: string): string | undefined {
+  const value = expression?.trim() ?? '';
+  const daily = /^(\d{1,2})\s+(\d{1,2})\s+\*\s+\*\s+\*$/.exec(value);
+  if (daily) {
+    const minute = Number(daily[1]);
+    const hour = Number(daily[2]);
+    if (minute <= 59 && hour <= 23) return `每天 ${String(hour).padStart(2, '0')}:${String(minute).padStart(2, '0')}`;
+  }
+  const hourly = /^(\d{1,2})\s+\*\s+\*\s+\*\s+\*$/.exec(value);
+  if (hourly) {
+    const minute = Number(hourly[1]);
+    if (minute <= 59) return minute === 0 ? '每小时整点' : `每小时 ${String(minute).padStart(2, '0')} 分`;
+  }
+  const everyMinutes = /^\*\/(\d{1,2})\s+\*\s+\*\s+\*\s+\*$/.exec(value);
+  if (everyMinutes && Number(everyMinutes[1]) > 0) return `每 ${Number(everyMinutes[1])} 分钟`;
+  return undefined;
 }
 
 function triggerLabel(schedule: RepositorySchedule): string {
   const trigger = schedule.trigger;
   switch (trigger.type) {
     case 'interval': return `每 ${trigger.everyMinutes ?? '?'} 分钟`;
-    case 'cron': return dailyCronLabel(trigger.cronExpression) ?? `Cron ${trigger.cronExpression ?? '—'}`;
+    case 'cron': return cronLabel(trigger.cronExpression) ?? '自定义时间计划';
     case 'calendar': return trigger.calendarAt ? `单次 · ${trigger.calendarAt}` : '指定时间';
     case 'condition': return `条件满足时 · ${trigger.condition?.kind ?? 'condition'}`;
     case 'repository-event': return `仓库事件 · ${trigger.eventName ?? 'repository event'}`;
@@ -83,16 +90,11 @@ function nextScheduleHint(schedule: RepositorySchedule): string | undefined {
       return next > Date.now() ? new Date(next).toISOString() : '下一次调度周期';
     }
   }
-  if (schedule.trigger.type === 'cron') return dailyCronLabel(schedule.trigger.cronExpression) ?? '由 Scheduler 计算';
-  if (schedule.trigger.type === 'condition') return '条件满足时';
+  if (schedule.trigger.type === 'cron') return cronLabel(schedule.trigger.cronExpression) ?? '按自定义时间计划';
+  if (schedule.trigger.type === 'condition') return '等待条件满足';
   return undefined;
 }
 
-function safeBoundSchedule(controllerHome: string, repoId: string, scheduleId?: string): RepositorySchedule | undefined {
-  if (!scheduleId) return undefined;
-  try { return getSchedule(controllerHome, repoId, scheduleId); } catch { return undefined; }
-}
-
 function occurrenceResult(occurrence?: ScheduleOccurrence): string | undefined {
   if (!occurrence) return undefined;
   if (occurrence.decision === 'nothing_to_do') return '无变化';
@@ -137,7 +139,6 @@ function occurrenceHistory(occurrences: ScheduleOccurrence[]): ConsoleAutomation
 
 function scheduleMode(schedule: RepositorySchedule): ConsoleAutomationMode {
   if (schedule.action.operation === 'external_controller_wake') return 'continuation';
-  if (schedule.action.operation === 'chatgpt_browser_prompt') return 'chatgpt_prompt';
   if (schedule.action.operation === 'browser_probe') return schedule.action.arguments?.keepalive_only === true ? 'browser_keepalive' : 'browser_watch';
   return 'schedule';
 }
@@ -146,8 +147,6 @@ function modeLabel(mode: ConsoleAutomationMode): string {
   if (mode === 'browser_watch') return '网页变更监听';
   if (mode === 'browser_keepalive') return '登录保活';
   if (mode === 'continuation') return '自动继续 Work';
-  if (mode === 'chatgpt_prompt') return 'ChatGPT 自动任务';
-  if (mode === 'routine') return '助手例行任务';
   return '自动任务';
 }
 
@@ -155,7 +154,6 @@ function scheduleSummary(mode: ConsoleAutomationMode): string {
   if (mode === 'browser_watch') return '静默观察目标页面；只有内容发生变化时才恢复 ChatGPT。';
   if (mode === 'browser_keepalive') return '静默刷新登录态；正常时不打扰，认证失效时再恢复 ChatGPT。';
   if (mode === 'continuation') return '按计划恢复绑定的 Work，让外部 Controller 继续未完成目标。';
-  if (mode === 'chatgpt_prompt') return '由 Forge 定时唤醒 ChatGPT 执行保存的任务提示，不占用 ChatGPT Schedule 名额。';
   return '由 Forge Schedule Engine 管理的持久自动任务。';
 }
 
@@ -164,12 +162,11 @@ function scheduleDelivery(schedule: RepositorySchedule, mode: ConsoleAutomationM
   if (mode === 'browser_watch') return `变化时唤醒 ${controller === 'chatgpt' ? 'ChatGPT' : controller}`;
   if (mode === 'browser_keepalive') return `登录失效时唤醒 ${controller === 'chatgpt' ? 'ChatGPT' : controller}`;
   if (mode === 'continuation') return `恢复 ${controller === 'chatgpt' ? 'ChatGPT' : controller}`;
-  if (mode === 'chatgpt_prompt') return '发送到 ChatGPT';
   return undefined;
 }
 
 function chatgptExecutionProfile(schedule: RepositorySchedule, mode: ConsoleAutomationMode): { agentModel?: string; reasoningLevel?: string; tabPolicy?: string } {
-  if (mode !== 'continuation' && mode !== 'chatgpt_prompt') return {};
+  if (mode !== 'continuation') return {};
   const args = schedule.action.arguments ?? {};
   const controller = typeof args.controller_type === 'string' ? args.controller_type : 'chatgpt';
   if (mode === 'continuation' && controller !== 'chatgpt') return {};
@@ -207,17 +204,34 @@ function scheduleNeedsAttention(schedule: RepositorySchedule): boolean {
   return Boolean(schedule.pausedReason && /(?:fail|error|auth|login|block|attention|maximum)/i.test(schedule.pausedReason));
 }
 
-function scheduleStatus(schedule: RepositorySchedule): ConsoleAutomationView['status'] {
+function scheduleStatus(schedule: RepositorySchedule, workStatus?: string): ConsoleAutomationView['status'] {
+  if (workStatus === 'completed' || /is terminal \(completed\)/i.test(schedule.pausedReason ?? '')) return 'completed';
+  if (workStatus === 'failed') return 'attention';
   if (schedule.enabled) return scheduleNeedsAttention(schedule) ? 'attention' : 'enabled';
   return scheduleNeedsAttention(schedule) ? 'attention' : 'paused';
 }
 
-function workBinding(controllerHome: string, repoId: string, schedule: RepositorySchedule): { id?: string; objective?: string } {
+function workBinding(controllerHome: string, repoId: string, schedule: RepositorySchedule): { id?: string; objective?: string; status?: string } {
   const value = schedule.action.arguments?.work_id;
   const workId = typeof value === 'string' && value.trim() ? value.trim() : undefined;
   if (!workId) return {};
   const work = getWorkContract({ controllerHome, repoId }, workId);
-  return { id: workId, objective: work?.objective };
+  return { id: workId, objective: work?.objective, status: work?.status };
+}
+
+function displayPauseReason(schedule: RepositorySchedule, workStatus?: string): string | undefined {
+  if (workStatus === 'completed' || /is terminal \(completed\)/i.test(schedule.pausedReason ?? '')) return '关联工作已经完成，这个自动任务不会再触发。';
+  if (schedule.lastObservationStatus === 'auth_required') return '目标登录状态已失效，完成重新登录后即可恢复。';
+  if (schedule.consecutiveFailures >= schedule.policy.maxFailures || /maximum consecutive failures/i.test(schedule.pausedReason ?? '')) return '连续执行失败达到上限，已自动暂停。修复问题后可以恢复任务。';
+  if (/canary completed/i.test(schedule.pausedReason ?? '')) return '验收任务已经完成。';
+  return schedule.pausedReason;
+}
+
+function attentionMessage(schedule: RepositorySchedule, workStatus?: string): string | undefined {
+  if (schedule.lastObservationStatus === 'auth_required') return '需要重新登录后才能继续自动执行。';
+  if (workStatus === 'failed') return '关联工作执行失败，需要检查失败原因后再恢复。';
+  if (schedule.consecutiveFailures >= schedule.policy.maxFailures) return '连续执行失败达到上限，任务已自动暂停。';
+  return undefined;
 }
 
 function policySummary(schedule: RepositorySchedule): string {
@@ -227,12 +241,9 @@ function policySummary(schedule: RepositorySchedule): string {
 export function listConsoleAutomations(controllerHome: string, repositories: RepositoryRecord[]): ConsoleAutomationView[] {
   const items: ConsoleAutomationView[] = [];
   for (const repository of repositories.filter((entry) => entry.enabled && !entry.removedAt)) {
-    const routines = listAssistantRoutines(repository.canonicalRoot).routines;
-    const bindings = new Map(routines.map((routine) => [routine.routineId, getAssistantRoutineScheduleBinding(repository.canonicalRoot, routine.routineId)]));
-    const boundScheduleIds = new Set([...bindings.values()].flatMap((binding) => binding ? [binding.scheduleId] : []));
-
     for (const schedule of listSchedules(controllerHome, repository.repoId)) {
-      if (boundScheduleIds.has(schedule.scheduleId)) continue;
+      if (schedule.action.operation === 'chatgpt_browser_prompt') continue;
+      if (schedule.action.operation === 'assistant_routine_execute') continue;
       const occurrences = listOccurrences(controllerHome, repository.repoId, schedule.scheduleId, 8);
       const last = occurrences[0];
       const mode = scheduleMode(schedule);
@@ -245,7 +256,7 @@ export function listConsoleAutomations(controllerHome: string, repositories: Rep
         repositoryName: repository.displayName,
         name: schedule.name,
         summary: scheduleSummary(mode),
-        status: scheduleStatus(schedule),
+        status: scheduleStatus(schedule, work.status),
         schedule: triggerLabel(schedule),
         timezone: schedule.trigger.timezone,
         delivery: scheduleDelivery(schedule, mode),
@@ -263,45 +274,13 @@ export function listConsoleAutomations(controllerHome: string, repositories: Rep
         lastRunAt: last?.updatedAt ?? schedule.lastTriggeredAt,
         lastResult: observationResult(schedule, last),
         nextRunHint: nextScheduleHint(schedule),
-        pausedReason: schedule.pausedReason,
+        pausedReason: displayPauseReason(schedule, work.status),
+        attentionMessage: attentionMessage(schedule, work.status),
         history: occurrenceHistory(occurrences),
-        actions: schedule.enabled ? ['run', 'pause'] : ['resume'],
+        actions: scheduleStatus(schedule, work.status) === 'completed' ? [] : schedule.enabled ? ['run', 'pause'] : ['resume'],
       });
     }
 
-    for (const routine of routines) {
-      const binding = bindings.get(routine.routineId);
-      const boundSchedule = safeBoundSchedule(controllerHome, repository.repoId, binding?.scheduleId);
-      const occurrences = boundSchedule ? listOccurrences(controllerHome, repository.repoId, boundSchedule.scheduleId, 8) : [];
-      const last = occurrences[0];
-      const scheduleAttention = routine.status === 'enabled' && boundSchedule && scheduleNeedsAttention(boundSchedule);
-      const status: ConsoleAutomationView['status'] = scheduleAttention ? 'attention' : routine.status === 'enabled' ? 'enabled' : routine.status === 'paused' ? 'paused' : 'disabled';
-      items.push({
-        id: routine.routineId,
-        source: 'routine',
-        repoId: repository.repoId,
-        repositoryName: repository.displayName,
-        name: routine.name,
-        summary: routine.naturalLanguageGoal,
-        status,
-        schedule: routine.scheduleText,
-        timezone: routine.timezone,
-        delivery: routine.output === 'assistant_inbox' ? 'ChatGPT 助手收件箱' : routine.output === 'gmail_draft' ? 'Gmail 草稿' : '不外发',
-        mode: 'routine',
-        modeLabel: modeLabel('routine'),
-        live: boundSchedule ? !boundSchedule.policy.shadowMode : undefined,
-        observationStatus: boundSchedule?.lastObservationStatus,
-        observationAt: boundSchedule?.lastObservationAt,
-        failureCount: boundSchedule?.consecutiveFailures,
-        policySummary: boundSchedule ? policySummary(boundSchedule) : undefined,
-        lastRunAt: last?.updatedAt ?? routine.lastRunAt,
-        lastResult: boundSchedule ? observationResult(boundSchedule, last) : occurrenceResult(last) ?? (routine.lastRunAt ? '已触发' : undefined),
-        nextRunHint: boundSchedule ? nextScheduleHint(boundSchedule) : routine.nextRunHint,
-        pausedReason: boundSchedule?.pausedReason,
-        history: occurrenceHistory(occurrences),
-        actions: scheduleAttention ? ['resume'] : routine.status === 'enabled' ? ['run', 'pause'] : routine.status === 'paused' ? ['resume'] : [],
-      });
-    }
   }
   return items.sort((a, b) => a.name.localeCompare(b.name));
 }
@@ -311,6 +290,7 @@ export function summarizeConsoleAutomations(items: ConsoleAutomationView[]) {
     total: items.length,
     enabled: items.filter((item) => item.status === 'enabled').length,
     paused: items.filter((item) => item.status === 'paused' || item.status === 'disabled').length,
+    completed: items.filter((item) => item.status === 'completed').length,
     needsAttention: items.filter((item) => item.status === 'attention').length,
   };
 }
@@ -325,16 +305,12 @@ export async function applyConsoleAutomationAction(
 ): Promise<unknown> {
   const repository = repositories.find((entry) => entry.repoId === repoId && entry.enabled && !entry.removedAt);
   if (!repository) throw new Error(`REPOSITORY_NOT_FOUND: ${repoId}`);
-  if (source === 'routine') {
-    if (action === 'run') return runAssistantRoutineNow(controllerHome, repository, id);
-    if (action === 'pause') return updateAssistantRoutineLifecycle(controllerHome, repository, id, 'paused');
-    if (action === 'resume') return updateAssistantRoutineLifecycle(controllerHome, repository, id, 'enabled');
-    throw new Error(`AUTOMATION_ACTION_UNSUPPORTED: routine/${action}`);
-  }
   if (source === 'schedule') {
     const schedule = getSchedule(controllerHome, repoId, id);
+    if (schedule.action.operation === 'chatgpt_browser_prompt') throw new Error('RETIRED_WORK_FREE_PROMPT_SCHEDULE');
+    if (schedule.action.operation === 'assistant_routine_execute') throw new Error('RETIRED_PERSONAL_ASSISTANT_SCHEDULE');
     if (action === 'pause') return saveSchedule(controllerHome, { ...schedule, enabled: false, pausedReason: undefined });
-    if (action === 'resume') return saveSchedule(controllerHome, { ...schedule, enabled: true, pausedReason: undefined, consecutiveFailures: 0 });
+    if (action === 'resume') return saveSchedule(controllerHome, { ...schedule, enabled: true, pausedReason: undefined, consecutiveFailures: 0, consecutiveNoops: 0, nextEligibleAt: undefined });
     if (action === 'run') return evaluateSchedule(controllerHome, schedule, true, { source: 'manual' });
     throw new Error(`AUTOMATION_ACTION_UNSUPPORTED: schedule/${action}`);
   }

package/src/cli/local-bridge/console-view-models.ts

@@ -251,7 +251,7 @@ export interface AccessStateViewModel {
   configuredAccessModeLabel: string;
   effectiveAccessMode: 'request' | 'full_access';
   effectiveAccessModeLabel: string;
-  effectiveToolset: 'core' | 'advanced' | 'full';
+  effectiveToolset: 'facade' | 'core' | 'advanced' | 'full';
   exposureRevision: number;
   lastAppliedAt?: string;
   source: string;
@@ -264,38 +264,6 @@ export interface AccessStateViewModel {
   toolGroups: string[];
 }
 
-/** Compact autonomous goal-loop status for console / local-bridge (no raw internal dumps). */
-export interface GoalLoopStatusViewModel {
-  activeCount: number;
-  goals: Array<{
-    title: string;
-    stage: string;
-    currentStep: string;
-    providerSelected?: string;
-    waitingReason?: string;
-    nextSafeAction?: string;
-    handoffPacketAvailable: boolean;
-    approvalRequired: boolean;
-    whyThisProvider?: string;
-    whatHappensNext?: string;
-    whatIsBlocked?: string;
-  }>;
-  invokableProviders: string[];
-  handoffOnlyProviders: string[];
-  providerHealth: Array<{
-    providerId: string;
-    status: string;
-    directDispatchAllowed: boolean;
-    handoffOnly: boolean;
-    summary: string;
-  }>;
-  /** Plain-language automation overview snippet. */
-  automationSummary?: string;
-  liveModelProvidersEffective?: boolean;
-  settingsPathHint?: string;
-  nextTickHint?: string;
-}
-
 export interface CommandCenterViewModel {
   schemaVersion: 1;
   generatedAt: string;
@@ -309,8 +277,6 @@ export interface CommandCenterViewModel {
   currentWork?: WorkSummaryViewModel;
   recentWork: WorkSummaryViewModel[];
   handoffs: HandoffCardViewModel[];
-  /** Autonomous goal loop surface (daemon-owned, above Issue/Task). */
-  goalLoop?: GoalLoopStatusViewModel;
   /** Assistant/plugin capabilities available to the controller (not the primary workflow). */
   pluginSummary: PluginSummaryViewModel;
   plugins: PluginCardViewModel[];