@pingagent/sdk 0.1.16 → 0.1.17

package/bin/pingagent.js

@@ -40,6 +40,7 @@ import {
   listPendingDecisionViews,
   summarizeHumanDelivery,
   listRecentBindingsForSession,
+  deriveOpenClawAgentState,
   deriveTransportHealth,
   readTransportPreference,
   switchTransportPreference,
@@ -208,15 +209,16 @@ function getHostPanelSurfaceUrl() {
 
 function getSurfaceRecommendationLines(primaryCommandPrefix = 'npx @pingagent/sdk', secondaryCommandPrefix = 'pingagent') {
   return [
-    'With GUI: Host Panel',
+    'GUI repair / approvals / audit: Host Panel',
     `  Start locally: ${primaryCommandPrefix} web`,
     ...(secondaryCommandPrefix && secondaryCommandPrefix !== primaryCommandPrefix ? [`  Or via local bin: ${secondaryCommandPrefix} web`] : []),
     `  URL when running: ${getHostPanelSurfaceUrl()}`,
-    'Headless / low-token: TUI',
+    'Headless repair surface: TUI',
     `  ${primaryCommandPrefix} host tui`,
     ...(secondaryCommandPrefix && secondaryCommandPrefix !== primaryCommandPrefix ? [`  ${secondaryCommandPrefix} host tui`] : []),
     `  ${primaryCommandPrefix} host tui --once`,
-    'MCP: agent/runtime control surface, not the default human operator UI',
+    'Agent default loop: pingagent_recent_sessions -> pingagent_focus_session -> pingagent_reply',
+    'MCP: agent/runtime control surface',
   ];
 }
 
@@ -457,6 +459,13 @@ function buildHostState(identityPath, selectedSessionKey = null, historyPageInde
       ? buildProjectionPreview(store, selectedSession.session_key, policy.doc.collaboration_projection?.preset || 'balanced', 5)
       : null;
     const humanDelivery = summarizeHumanDelivery(store, 20);
+    const agentState = deriveOpenClawAgentState({
+      runtime_status: ingressRuntime,
+      sessions,
+      pending_decisions: pendingCollaborationEventsGlobal.length,
+      human_delivery: humanDelivery,
+      transport_health: transportHealth,
+    });
     const selectedRecentBindings = selectedSession
       ? listRecentBindingsForSession(store, selectedSession.session_key, selectedSession.conversation_id, 12)
       : [];
@@ -470,6 +479,7 @@ function buildHostState(identityPath, selectedSessionKey = null, historyPageInde
       ingressRuntime,
       transportPreference,
       transportHealth,
+      agentState,
       activeChatSessionFile: getActiveSessionFilePath(),
       sessionMapPath: getSessionMapFilePath(),
       sessionBindingAlertsPath: getSessionBindingAlertsFilePath(),
@@ -556,22 +566,29 @@ function renderHostTuiScreen(hostState, uiState) {
     last_canary_ok: null,
     last_canary_at: null,
   };
+  const agentState = hostState.agentState || {
+    state: 'activating',
+    summary: 'Activation is still in progress.',
+    next_action: 'Wait for activation to finish.',
+    reason: null,
+  };
   const sinceLastSeenGlobal = hostState.sinceLastSeenGlobal || {};
   const lines = [
     'PingAgent Host TUI',
     `DID: ${hostState.identity.did}`,
     `status=${formatStatusLine(uiState?.statusLevel || 'info', uiState?.statusMessage || '(ready)')}${statusTs}${statusCountdown}`,
-    `runtime_mode=${hostState.runtimeMode}  receive_mode=${hostState.ingressRuntime?.receive_mode || 'webhook'}  current_openclaw_chat=${hostState.activeChatSession || '(none)'}`,
+    `agent_state=${agentState.state}  runtime_mode=${hostState.runtimeMode}  receive_mode=${hostState.ingressRuntime?.receive_mode || 'webhook'}`,
+    `agent_summary=${agentState.summary}`,
+    `agent_next_action=${agentState.next_action}`,
     `ingress=${ingressLabel}${degraded ? '  action=[f] fix-now' : ''}`,
     `transport=${transportHealth.transport_mode} preferred=${transportHealth.preferred_transport_mode} state=${transportHealth.state} retry_queue=${transportHealth.retry_queue_length} failures=${transportHealth.consecutive_failures}`,
     `human_delivery mode=${humanDelivery.mode || 'projection_outbox'} active_bindings=${humanDelivery.active_bindings ?? 0} pending=${humanDelivery.pending_intents ?? 0} unresolved=${humanDelivery.unresolved_intents ?? 0} failed=${humanDelivery.failed_intents ?? 0} acked=${humanDelivery.acknowledged_intents ?? 0}`,
     `human_delivery_channels supported=${(humanDelivery.supported_channels || []).join(',') || '(none)'} unsupported=${(humanDelivery.unsupported_channels || []).join(',') || '(none)'} canary_ok=${typeof humanDelivery.last_canary_ok === 'boolean' ? String(humanDelivery.last_canary_ok) : '(unknown)'} at=${humanDelivery.last_canary_at || '(none)'}`,
     uiState?.publicLinkUrl ? `public_link=${uiState.publicLinkUrl}` : null,
-    `sessions=${sessions.length}  unread_total=${hostState.unreadTotal ?? 0}  alert_sessions=${hostState.alertSessions ?? 0}  view=${view}  projection=${hostState.projectionPreset || 'balanced'}`,
+    `sessions=${sessions.length}  unread_total=${hostState.unreadTotal ?? 0}  repair_alert_sessions=${hostState.alertSessions ?? 0}  view=${view}  projection=${hostState.projectionPreset || 'balanced'}`,
     `since_last_seen external=${sinceLastSeenGlobal.new_external_messages ?? 0} conclusions=${sinceLastSeenGlobal.new_conclusions ?? 0} decisions=${sinceLastSeenGlobal.new_decisions ?? 0} failures=${sinceLastSeenGlobal.new_failures ?? 0}`,
     `policy=${hostState.policyPath}`,
-    `chat_link_map=${hostState.sessionMapPath}`,
-    `chat_link_alerts=${hostState.sessionBindingAlertsPath}`,
+    agentState.reason ? `agent_reason=${truncateLine(agentState.reason, 120)}` : null,
     hostState.ingressRuntime?.hooks_last_error ? `hooks_error=${truncateLine(hostState.ingressRuntime.hooks_last_error, 120)}` : null,
     '',
   ].filter(Boolean);
@@ -590,7 +607,6 @@ function renderHostTuiScreen(hostState, uiState) {
     lines.push('- x: cancel selected task (in task views)');
     lines.push('- p: multiline reply prompt (detail view)');
     lines.push('- S: edit carry-forward summary (detail view)');
-    lines.push('- d: try demo agent preset');
     lines.push('- o: open local history paging (detail view)');
     lines.push('- n / p: older / newer history page (history view)');
     lines.push('- s or /: search local history (history view)');
@@ -603,8 +619,6 @@ function renderHostTuiScreen(hostState, uiState) {
     lines.push('- A: apply first open trust recommendation for selected session');
     lines.push('- D: dismiss current open recommendation');
     lines.push('- R: reopen dismissed/superseded recommendation');
-    lines.push('- B: attach selected session to the current OpenClaw chat');
-    lines.push('- C: detach the selected chat link');
     lines.push('- q: quit');
   } else if (view === 'history') {
     lines.push('Conversation History');
@@ -714,13 +728,12 @@ function renderHostTuiScreen(hostState, uiState) {
       lines.push(`remote=${selected.remote_did || '(unknown)'}`);
       lines.push(`trust=${selected.trust_state} unread=${selected.unread_count}`);
       lines.push(`last_preview=${selected.last_message_preview || '(none)'}`);
-      lines.push(`chat_link=${selected.binding?.session_key || '(none)'}`);
-      lines.push(`current_openclaw_chat=${hostState.activeChatSession || '(none)'}`);
+      lines.push(`compatibility_route=${selected.binding?.session_key || '(none)'}`);
       if (selected.binding_alert) {
-        lines.push('needs_reconnect=true');
-        lines.push(`warning=${selected.binding_alert.message}`);
+        lines.push('compatibility_route_stale=true');
+        lines.push(`repair_warning=${selected.binding_alert.message}`);
       } else {
-        lines.push('needs_reconnect=false');
+        lines.push('compatibility_route_stale=false');
       }
       if (openRecommendation) {
         lines.push(`trust_action=${getTrustRecommendationActionLabel(openRecommendation)}`);
@@ -748,17 +761,17 @@ function renderHostTuiScreen(hostState, uiState) {
         '[D] dismiss-rec',
         '[R] reopen-rec',
         '[m] mark-read',
-        '[d] demo',
         '[p] reply',
         '[S] summary',
         pendingCollaborationEvents.length ? '[u] approve-decision' : null,
         pendingCollaborationEvents.length ? '[U] reject-decision' : null,
         '[o] history',
         '[t] tasks',
-        '[B] attach-chat',
-        '[C] detach-chat',
       ].filter(Boolean).join('  ');
       lines.push(`actions=${actionBar}`);
+      if (selected.binding || selected.binding_alert) {
+        lines.push('compatibility_note=Legacy current-thread routing is available for repair only; the default human-delivery path uses bindings + notification intents.');
+      }
       lines.push('');
       lines.push('Carry-Forward Summary');
       if (selectedSummary) {
@@ -827,7 +840,7 @@ function renderHostTuiScreen(hostState, uiState) {
   }
 
   lines.push('');
-  lines.push('Keys: ↑/↓ or j/k select  Enter/l open  Esc/h back  g/G jump  r refresh  a approve  u/U decide  A apply-rec  D dismiss-rec  R reopen-rec  d demo  m read  p reply  o history  s search  t tasks  x cancel-task  y dump  f fix-hooks  b transport->bridge  c transport->channel  B attach-chat  C detach-chat  ? help  q quit');
+  lines.push('Keys: ↑/↓ or j/k select  Enter/l open  Esc/h back  g/G jump  r refresh  a approve  u/U decide  A apply-rec  D dismiss-rec  R reopen-rec  m read  p reply  o history  s search  t tasks  x cancel-task  y dump  f fix-hooks  b transport->bridge  c transport->channel  ? help  q quit');
   return lines.join('\n');
 }
 
@@ -1548,17 +1561,17 @@ async function runHostTui(identityPath, opts) {
       if (!selected?.conversation_id) return;
       const current = latestState.activeChatSession || '(none)';
       const previous = selected.binding?.session_key || '(none)';
-      const confirmed = await confirmAction(`Attach chat link for conversation ${selected.conversation_id}\nRemote DID: ${selected.remote_did || '(unknown)'}\nCurrent OpenClaw chat: ${current}\nPrevious chat link: ${previous}\nProceed?`);
+      const confirmed = await confirmAction(`Repair legacy compatibility route for conversation ${selected.conversation_id}\nRemote DID: ${selected.remote_did || '(unknown)'}\nCurrent compatibility target: ${current}\nPrevious compatibility route: ${previous}\nProceed?`);
       if (confirmed) {
         if (!latestState.activeChatSession) {
-          setStatus('Attach failed: no active OpenClaw chat.', 'err');
+          setStatus('Compatibility repair failed: no active compatibility target.', 'err');
           latestState = redraw();
           return;
         }
         setSessionBinding(selected.conversation_id, latestState.activeChatSession);
-        setStatus(`Attached chat link ${selected.conversation_id} -> ${latestState.activeChatSession}`, 'ok');
+        setStatus(`Compatibility route repaired ${selected.conversation_id} -> ${latestState.activeChatSession}`, 'ok');
       } else {
-        setStatus('Attach chat link cancelled.', 'warn');
+        setStatus('Compatibility repair cancelled.', 'warn');
       }
       latestState = redraw();
       return;
@@ -1567,7 +1580,7 @@ async function runHostTui(identityPath, opts) {
       const selected = (latestState.sessions || []).find((session) => session.session_key === uiState.selectedSessionKey);
       if (!selected?.conversation_id) return;
       removeSessionBinding(selected.conversation_id);
-      setStatus(`Detached chat link for ${selected.conversation_id}`, 'ok');
+      setStatus(`Cleared compatibility route for ${selected.conversation_id}`, 'ok');
       latestState = redraw();
       return;
     }
@@ -3520,88 +3533,52 @@ async function runHostBootstrap(opts) {
     process.exit(1);
   }
 
-  const steps = [];
-  const runStep = (label, args) => {
-    const result = runOpenClawInstall(args);
-    steps.push({ label, args, result });
-    return { label, args, result };
-  };
-
-  const installStep = runStep('install', []);
-  const hooksStep = installStep.result.ok ? runStep('hooks repair', ['fix-hooks']) : null;
-  const verifyStep = installStep.result.ok && hooksStep?.result.ok
-    ? runStep('runtime verify', ['verify-runtime', '--fix-hooks'])
-    : null;
-
+  const installStep = runOpenClawInstall([]);
+  const steps = [{ label: 'activate', result: installStep }];
   let runnerStep = null;
-  if (verifyStep?.result.ok && opts.write) {
+  if (installStep.ok && opts.write) {
     const runnerArgs = ['init-runner', '--ingress', '--panel'];
     if (template) runnerArgs.push('--template', template);
     const supportsWrite = !template || template === 'launchd' || template === 'systemd';
     if (supportsWrite) runnerArgs.push('--write');
-    runnerStep = runStep(supportsWrite ? 'runner setup' : 'runner template', runnerArgs);
+    const result = runOpenClawInstall(runnerArgs);
+    steps.push({ label: supportsWrite ? 'runner setup' : 'runner template', result });
+    runnerStep = { result };
+  }
+
+  console.log('PingAgent Host Bootstrap (compatibility alias)');
+  console.log('=============================================');
+  console.log('bootstrap_role=compatibility_alias');
+  console.log('preferred_entry=npx @pingagent/openclaw-install');
+  console.log('');
+
+  if (installStep.stdout.trim()) {
+    console.log(installStep.stdout.trim());
+  }
+  if (installStep.stderr.trim()) {
+    console.error(installStep.stderr.trim());
   }
 
   if (runnerStep?.result.stdout && opts.write) {
+    console.log('');
     console.log(runnerStep.result.stdout.trim());
     if (runnerStep.result.stderr.trim()) console.error(runnerStep.result.stderr.trim());
-    console.log('');
   }
 
   const failed = steps.find((step) => !step.result.ok) ?? null;
-  const formatStepStatus = (step, fallback = 'skipped') => (step ? (step.result.ok ? 'ok' : 'failed') : fallback);
-  const runnerStatus = !opts.write
-    ? 'not_written'
-    : !runnerStep
-      ? 'skipped'
-      : !runnerStep.result.ok
-        ? 'failed'
-        : (template && template !== 'launchd' && template !== 'systemd')
-          ? 'template_printed_not_started'
-          : 'written_not_started';
-  const installerSource = installStep.result.source || 'unknown';
-
-  console.log('PingAgent Host Bootstrap');
-  console.log('========================');
-  console.log(`install=${formatStepStatus(installStep)}`);
-  console.log(`hooks_repair=${formatStepStatus(hooksStep)}`);
-  console.log(`runtime_verify=${formatStepStatus(verifyStep)}`);
-  console.log(`installer_source=${installerSource}`);
-  console.log(`runner=${runnerStatus}`);
-  console.log(`host_panel_url=${getHostPanelSurfaceUrl()}`);
-  console.log('host_panel_started_by_bootstrap=false');
-  console.log('host_panel_start=npx @pingagent/sdk web');
-  console.log('host_panel_start_local=pingagent web');
-  console.log('tui=npx @pingagent/sdk host tui');
-  console.log('tui_local=pingagent host tui');
-  console.log('');
-  console.log('Control surfaces:');
-  for (const line of getSurfaceRecommendationLines('npx @pingagent/sdk', 'pingagent')) console.log(line);
-  console.log('');
-  if (!opts.write) {
-    console.log('Next steps:');
-    console.log('  Bootstrap validates and repairs config, but it does not start long-lived daemons.');
-    console.log('  Start the Host Panel now with: npx @pingagent/sdk web (or pingagent web)');
-    console.log('  Use the headless surface now with: npx @pingagent/sdk host tui (or pingagent host tui)');
-    console.log(`  Re-run with: npx @pingagent/sdk host bootstrap --write${template ? ` --template ${template}` : ''}`);
-    console.log('  Manual path: npx @pingagent/openclaw-install init-runner --ingress --panel');
-  } else if (runnerStep?.result.ok) {
-    console.log('Next steps:');
-    console.log('  Runner files/templates were generated, but bootstrap did not start those services.');
-    if (!template || template === 'launchd' || template === 'systemd') {
-      console.log('  Follow the printed launchctl/systemctl instructions to start them.');
-    } else {
-      console.log('  Start the generated runner with your chosen process manager.');
+  if (!failed) {
+    console.log('');
+    console.log('Compatibility surfaces:');
+    for (const line of getSurfaceRecommendationLines('npx @pingagent/sdk', 'pingagent')) console.log(line);
+    if (opts.write && runnerStep?.result.ok) {
+      console.log('');
+      console.log('runner_files=written');
     }
   }
 
   if (failed) {
-    const stdout = failed.result.stdout.trim();
-    const stderr = failed.result.stderr.trim();
     console.error('');
-    console.error(`Bootstrap failed during ${failed.label}.`);
-    if (stdout) console.error(stdout);
-    if (stderr) console.error(stderr);
+    console.error(`Bootstrap alias failed during ${failed.label}.`);
     process.exit(1);
   }
 }
@@ -3612,7 +3589,7 @@ const host = program
 
 host
   .command('bootstrap')
-  .description('Run the idempotent OpenClaw activation flow and print the recommended Host Panel / TUI surfaces')
+  .description('Compatibility alias for the OpenClaw activation flow. Prefer npx @pingagent/openclaw-install.')
   .option('--write', 'Write launchd/systemd runner files when supported')
   .option('--template <name>', 'Runner template: launchd, systemd, docker, pm2, or supervisord')
   .action(async (opts) => {
@@ -3621,7 +3598,7 @@ host
 
 host
   .command('tui')
-  .description('Start the headless / low-token terminal UI for runtime, sessions, chat links, and repair actions')
+  .description('Start the headless terminal repair / audit / approval surface for OpenClaw hosts')
   .option('--once', 'Print one snapshot and exit')
   .option('--refresh-ms <ms>', 'Refresh interval in interactive mode', '2000')
   .option('--profile <name>', 'Use profile from ~/.pingagent/<name>')
@@ -3636,7 +3613,7 @@ host
 
 program
   .command('web')
-  .description('Start the Host Panel, the primary GUI surface for runtime inspection, trust policy, and repair. Use pingagent host tui for headless or low-token operation.')
+  .description('Start the Host Panel GUI for repair, audit, approvals, and advanced runtime inspection. Use pingagent host tui for headless operation.')
   .option('--port <port>', 'Port for the web server', '3846')
   .action(async (opts) => {
     const serverUrl = process.env.PINGAGENT_SERVER_URL || DEFAULT_SERVER;