@pellux/goodvibes-agent 1.4.4 → 1.5.1

package/src/panels/builtin/session.ts

@@ -1,138 +0,0 @@
-import { networkInterfaces } from 'node:os';
-import { existsSync, readFileSync } from 'node:fs';
-import type { PanelManager } from '../panel-manager.ts';
-import { SessionBrowserPanel } from '../session-browser-panel.ts';
-import { QrPanel } from '../qr-panel.ts';
-import { DocsPanel } from '../docs-panel.ts';
-import { PanelListPanel } from '../panel-list-panel.ts';
-import { TokenBudgetPanel } from '../token-budget-panel.ts';
-import type { ResolvedBuiltinPanelDeps } from './shared.ts';
-import { requireUiServices } from './shared.ts';
-import {
-  buildCompanionConnectionInfo,
-} from '@pellux/goodvibes-sdk/platform/pairing';
-import { copyToClipboard } from '../../utils/clipboard.ts';
-import { GOODVIBES_AGENT_PAIRING_SURFACE } from '../../config/surface.ts';
-
-function getLocalNetworkIp(): string {
-  const nets = networkInterfaces();
-  for (const name of Object.keys(nets)) {
-    for (const net of nets[name] ?? []) {
-      if (net.family === 'IPv4' && !net.internal) {
-        return net.address;
-      }
-    }
-  }
-  return 'localhost';
-}
-
-function readBootstrapPassword(credentialPath: string): string | undefined {
-  try {
-    const content = readFileSync(credentialPath, 'utf-8');
-    for (const line of content.split('\n')) {
-      if (line.startsWith('password=')) {
-        return line.slice('password='.length).trim();
-      }
-    }
-  } catch {
-    // credential file may not exist yet
-  }
-  return undefined;
-}
-
-function readOperatorToken(tokenPath: string): string | null {
-  if (!existsSync(tokenPath)) return null;
-  try {
-    const parsed = JSON.parse(readFileSync(tokenPath, 'utf-8')) as unknown;
-    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) return null;
-    const token = 'token' in parsed ? parsed.token : undefined;
-    return typeof token === 'string' && token.trim().length > 0 ? token : null;
-  } catch {
-    return null;
-  }
-}
-
-export function registerSessionPanels(manager: PanelManager, deps: ResolvedBuiltinPanelDeps): void {
-  manager.registerType({
-    id: 'qr-code',
-    name: 'QR Code',
-    icon: 'Q',
-    category: 'session',
-    description: 'QR code for companion app pairing through the connected GoodVibes host',
-    factory: () => {
-      if (!deps.connectedHostTokenDir) throw new Error('connected host token directory must be provided to the session panel factory via BuiltinPanelDeps');
-      const token = readOperatorToken(`${deps.connectedHostTokenDir}/operator-tokens.json`);
-      const connectedHostPort = deps.configManager.get('controlPlane.port');
-      const connectedHostName = String(process.env['GOODVIBES_AGENT_RUNTIME_HOST'] ?? process.env['GOODVIBES_DAEMON_HOST'] ?? getLocalNetworkIp());
-      const connectedHostUrl = `http://${connectedHostName}:${connectedHostPort}`;
-      const bootstrapPassword = readBootstrapPassword(deps.localUserAuthManager.getBootstrapCredentialPath());
-      const connectionInfo = token
-        ? buildCompanionConnectionInfo({
-          daemonUrl: connectedHostUrl,
-          token,
-          password: bootstrapPassword,
-          surface: GOODVIBES_AGENT_PAIRING_SURFACE,
-        })
-        : {
-          url: connectedHostUrl,
-          token: '',
-          username: 'admin',
-          ...(bootstrapPassword !== undefined ? { password: bootstrapPassword } : {}),
-          surface: GOODVIBES_AGENT_PAIRING_SURFACE,
-        };
-      return new QrPanel(connectionInfo, undefined, copyToClipboard);
-    },
-  });
-
-  manager.registerType({
-    id: 'sessions',
-    name: 'Sessions',
-    icon: 'H',
-    category: 'session',
-    description: 'Browse, search, and resume past conversation sessions',
-    factory: () => new SessionBrowserPanel(deps.sessionManager, deps.resumeSession),
-  });
-
-  manager.registerType({
-    id: 'docs',
-    name: 'Docs',
-    icon: '?',
-    category: 'session',
-    description: 'Tool list, model capabilities, and keyboard shortcut reference',
-    factory: () => new DocsPanel(deps.toolRegistry, deps.providerRegistry),
-  });
-
-  manager.registerType({
-    id: 'panel-list',
-    name: 'Panel List',
-    icon: 'L',
-    category: 'session',
-    description: 'Browse all registered panels grouped by category, with open/closed status and Enter-to-open',
-    factory: () => new PanelListPanel(manager, deps.componentHealthMonitor),
-  });
-
-  manager.registerType({
-    id: 'system-messages',
-    name: 'System Messages',
-    icon: 'J',
-    category: 'monitoring',
-    description: 'Operational system messages routed away from the main conversation (scans, discovery, plugin events, tool status)',
-    preload: true,
-    factory: () => deps.systemMessagesPanel,
-  });
-
-  manager.registerType({
-    id: 'tokens',
-    name: 'Tokens',
-    icon: 'K',
-    category: 'monitoring',
-    description: 'Token budget tracker: per-turn and cumulative usage with context window gauge',
-    factory: () => {
-      const panel = new TokenBudgetPanel(deps.sessionMemoryStore, deps.configManager);
-      if (deps.orchestrator && deps.getCtxWindow) {
-        panel.wire(deps.orchestrator, deps.getCtxWindow, requireUiServices(deps).readModels.session);
-      }
-      return panel;
-    },
-  });
-}

package/src/panels/builtin/shared.ts

@@ -1,275 +0,0 @@
-import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
-import type { ServiceRegistry } from '@pellux/goodvibes-sdk/platform/config';
-import type { ToolRegistry } from '@pellux/goodvibes-sdk/platform/tools';
-import type { ProviderRegistry } from '@pellux/goodvibes-sdk/platform/providers';
-import type { Orchestrator } from '../../core/orchestrator';
-import type { MemoryRegistry } from '@pellux/goodvibes-sdk/platform/state';
-import type { ApprovalBroker, SharedSessionBroker } from '@pellux/goodvibes-sdk/platform/control-plane';
-import type { AutomationManager } from '@pellux/goodvibes-sdk/platform/automation';
-import type { ControlPlaneRecentEvent } from '@pellux/goodvibes-sdk/platform/control-plane';
-import type { UiRuntimeServices } from '../../runtime/ui-services.ts';
-import type { PluginManagerObserver } from '@pellux/goodvibes-sdk/platform/plugins';
-import type { HookWorkbench } from '@pellux/goodvibes-sdk/platform/hooks';
-import type { HookDispatcher } from '@pellux/goodvibes-sdk/platform/hooks';
-import type { HookActivityTracker } from '@pellux/goodvibes-sdk/platform/hooks';
-import type { McpRegistry } from '@pellux/goodvibes-sdk/platform/mcp';
-import type { PolicyRuntimeState } from '@/runtime/index.ts';
-import type { SessionManager } from '@pellux/goodvibes-sdk/platform/sessions';
-import type { SubscriptionManager } from '@pellux/goodvibes-sdk/platform/config';
-import type { UserAuthManager } from '@pellux/goodvibes-sdk/platform/security';
-import type { SessionMemoryStore } from '@pellux/goodvibes-sdk/platform/core';
-import type { ExecutionPlanManager } from '@pellux/goodvibes-sdk/platform/core';
-import type { AdaptivePlanner } from '@pellux/goodvibes-sdk/platform/core';
-import type { ProjectPlanningService } from '@pellux/goodvibes-sdk/platform/knowledge';
-import type { KnowledgeService } from '@pellux/goodvibes-sdk/platform/knowledge';
-import type { ApiTokenAuditor } from '@pellux/goodvibes-sdk/platform/security';
-import type { ComponentHealthMonitor } from '../../runtime/perf/panel-health-monitor.ts';
-import type { WorktreeRegistry } from '@/runtime/index.ts';
-import type { SandboxSessionRegistry } from '@/runtime/index.ts';
-
-export interface BuiltinPanelDeps {
-  /** Config manager for settings-sync and other config-backed panels. */
-  configManager?: ConfigManager;
-  /** Getter returning the main orchestrator's cumulative token usage. */
-  getOrchestratorUsage?: () => { input: number; output: number; cacheRead: number; cacheWrite: number; model?: string };
-  /** Optional cost budget alert threshold in USD (0 = disabled). */
-  budgetThreshold?: number;
-  /** Tool registry for Docs panel. */
-  toolRegistry?: ToolRegistry;
-  /** Provider registry for Docs panel model list. */
-  providerRegistry: ProviderRegistry;
-  /** Local auth manager for panels that inspect shared auth state. */
-  localUserAuthManager?: UserAuthManager;
-  /** Session manager for panels that inspect shared session state. */
-  sessionManager?: SessionManager;
-  /** Subscription manager for panels that inspect shared provider subscription state. */
-  subscriptionManager?: SubscriptionManager;
-  /** Shared service registry for services-backed panels. */
-  serviceRegistry?: ServiceRegistry;
-  /** Context window size in tokens (for ContextVisualizerPanel). */
-  contextWindow?: number;
-  /** Main Orchestrator instance for TokenBudgetPanel.wire(). */
-  orchestrator?: Orchestrator;
-  /** Callback returning the current model context window size (for TokenBudgetPanel). */
-  getCtxWindow?: () => number;
-  /** Resume a saved session directly through the session controller path. */
-  resumeSession?: (sessionId: string) => void;
-  /** Request a shell repaint directly rather than routing through a retired event path. */
-  requestRender?: () => void;
-  /** Submit a Planning panel answer through the normal Agent chat/planning coordinator path. */
-  submitPlanningAnswer?: (answer: string) => void;
-  /** Pause the Agent-owned planning loop and return focus to normal prompt input. */
-  dismissPlanning?: () => void;
-  /** ForensicsRegistry for the Forensics panel. */
-  forensicsRegistry?: import('@/runtime/index.ts').ForensicsRegistry;
-  /** MemoryRegistry for the Memory panel. */
-  memoryRegistry?: MemoryRegistry;
-  /** Isolated Agent Knowledge service for the Agent Knowledge panel. */
-  agentKnowledgeService?: Pick<KnowledgeService, 'getStatus'>;
-  /** Shared policy runtime state for governance/policy diagnostics. */
-  policyRuntimeState?: import('@/runtime/index.ts').PolicyRuntimeState;
-  /** Approval broker for control-plane/operator panels. */
-  approvalBroker?: ApprovalBroker;
-  /** Shared session broker for control-plane/operator panels. */
-  sessionBroker?: SharedSessionBroker;
-  /** Automation manager for schedule/operator panels. */
-  automationManager?: AutomationManager;
-  /** Recent control-plane events provider for control-plane/operator panels. */
-  getControlPlaneRecentEvents?: (limit: number) => readonly ControlPlaneRecentEvent[];
-  /** Token auditor for the security control-room panel. */
-  tokenAuditor: ApiTokenAuditor;
-  /** Shared component-health monitor for rate-limited panels and diagnostics. */
-  componentHealthMonitor: ComponentHealthMonitor;
-  /** Inert shell dependency in Agent; build worktree UX belongs to GoodVibes TUI delegation. */
-  worktreeRegistry: WorktreeRegistry;
-  /** Isolation session registry used by MCP internals; Agent does not expose local execution-isolation command UX. */
-  sandboxSessionRegistry: SandboxSessionRegistry;
-  /**
-   * Resolved connected-host token directory (e.g. `~/.goodvibes/daemon`) — owned by the
-   * composition root and passed explicitly so panel factories do not discover cwd/home implicitly.
-   */
-  connectedHostTokenDir?: string;
-  /** Session memory store for context and token budget panels. */
-  sessionMemoryStore?: SessionMemoryStore;
-  /** Execution plan manager for plan dashboard panels. */
-  planManager?: ExecutionPlanManager;
-  /** Adaptive planner for ops strategy panels. */
-  adaptivePlanner?: AdaptivePlanner;
-  /** Passive project planning artifact service. */
-  projectPlanningService?: ProjectPlanningService;
-  /** Stable workspace project id for project:<projectId> planning namespaces. */
-  projectPlanningProjectId?: string;
-  /** Agent-owned persistent work plan store. */
-  workPlanStore?: import('../../work-plans/work-plan-store.ts').WorkPlanStore;
-  /** Shared system-messages panel instance attached from boot so low-priority chatter stays out of conversation. */
-  systemMessagesPanel?: import('../system-messages-panel.ts').SystemMessagesPanel;
-  /** Explicit UI-facing runtime services for operator panels and modals. */
-  uiServices?: UiRuntimeServices;
-  /** Shared plugin manager observer for plugin and security panels. */
-  pluginManager?: PluginManagerObserver;
-  /** Shared hook dispatcher for the hooks control-room panel. */
-  hookDispatcher?: Pick<HookDispatcher, 'listHooks' | 'getChains'>;
-  /** Shared hook workbench for the hooks control-room panel. */
-  hookWorkbench?: HookWorkbench;
-  /** Shared hook activity tracker for the hooks control-room panel. */
-  hookActivityTracker?: Pick<HookActivityTracker, 'listRecent'>;
-  /** Shared MCP registry for security panels and MCP workspace commands. */
-  mcpRegistry?: McpRegistry;
-}
-
-export type ResolvedBuiltinPanelDeps = Omit<
-  BuiltinPanelDeps,
-  | 'configManager'
-  | 'localUserAuthManager'
-  | 'sessionManager'
-  | 'subscriptionManager'
-  | 'serviceRegistry'
-  | 'sessionMemoryStore'
-  | 'planManager'
-  | 'adaptivePlanner'
-  | 'projectPlanningService'
-  | 'projectPlanningProjectId'
-  | 'workPlanStore'
-  | 'policyRuntimeState'
-  | 'systemMessagesPanel'
-> & {
-  readonly configManager: ConfigManager;
-  readonly localUserAuthManager: UserAuthManager;
-  readonly sessionManager: SessionManager;
-  readonly subscriptionManager: SubscriptionManager;
-  readonly serviceRegistry: ServiceRegistry;
-  readonly sessionMemoryStore: SessionMemoryStore;
-  readonly planManager: ExecutionPlanManager;
-  readonly adaptivePlanner: AdaptivePlanner;
-  readonly projectPlanningService: ProjectPlanningService;
-  readonly projectPlanningProjectId: string;
-  readonly workPlanStore: import('../../work-plans/work-plan-store.ts').WorkPlanStore;
-  readonly policyRuntimeState: PolicyRuntimeState;
-  readonly systemMessagesPanel: import('../system-messages-panel.ts').SystemMessagesPanel;
-};
-
-export interface ControlPlanePanelFactoryDeps {
-  readonly approvalBroker: ApprovalBroker;
-  readonly sessionBroker: SharedSessionBroker;
-  readonly getControlPlaneRecentEvents: (limit: number) => readonly ControlPlaneRecentEvent[];
-}
-
-function requireBuiltinPanelDep<TValue>(value: TValue | undefined, message: string): TValue {
-  if (value === undefined) {
-    throw new Error(message);
-  }
-  return value;
-}
-
-export function resolveBuiltinPanelDeps(deps: BuiltinPanelDeps): ResolvedBuiltinPanelDeps {
-  const uiServices = requireUiServices(deps);
-  return {
-    ...deps,
-    configManager: requireBuiltinPanelDep(
-      uiServices.platform.configManager,
-      'Config manager must be wired at bootstrap for builtin panels.',
-    ),
-    localUserAuthManager: requireBuiltinPanelDep(
-      uiServices.platform.localUserAuthManager,
-      'Local auth manager must be wired at bootstrap for builtin panels.',
-    ),
-    sessionManager: requireBuiltinPanelDep(
-      uiServices.sessions.sessionManager,
-      'Session manager must be wired at bootstrap for builtin panels.',
-    ),
-    subscriptionManager: requireBuiltinPanelDep(
-      uiServices.platform.subscriptionManager,
-      'Subscription manager must be wired at bootstrap for builtin panels.',
-    ),
-    serviceRegistry: requireBuiltinPanelDep(
-      uiServices.platform.serviceRegistry,
-      'Service registry must be wired at bootstrap for builtin panels.',
-    ),
-    sessionMemoryStore: requireBuiltinPanelDep(
-      uiServices.sessions.sessionMemoryStore,
-      'Session memory store must be wired at bootstrap for builtin panels.',
-    ),
-    planManager: requireBuiltinPanelDep(
-      uiServices.planning.planManager,
-      'Execution plan manager must be wired at bootstrap for builtin panels.',
-    ),
-    adaptivePlanner: requireBuiltinPanelDep(
-      uiServices.planning.adaptivePlanner,
-      'Adaptive planner must be wired at bootstrap for builtin panels.',
-    ),
-    projectPlanningService: requireBuiltinPanelDep(
-      uiServices.planning.projectPlanningService,
-      'Project planning service must be wired at bootstrap for builtin panels.',
-    ),
-    projectPlanningProjectId: requireBuiltinPanelDep(
-      uiServices.planning.projectPlanningProjectId,
-      'Project planning project id must be wired at bootstrap for builtin panels.',
-    ),
-    workPlanStore: requireBuiltinPanelDep(
-      uiServices.planning.workPlanStore,
-      'Work plan store must be wired at bootstrap for builtin panels.',
-    ),
-    policyRuntimeState: requireBuiltinPanelDep(
-      uiServices.platform.policyRuntimeState,
-      'Policy runtime state must be wired at bootstrap for builtin panels.',
-    ),
-    systemMessagesPanel: requireBuiltinPanelDep(
-      deps.systemMessagesPanel,
-      'System messages panel must be wired at bootstrap for builtin panels.',
-    ),
-  };
-}
-
-export function requireControlPlanePanelDeps(deps: BuiltinPanelDeps): ControlPlanePanelFactoryDeps {
-  if (!deps.approvalBroker || !deps.sessionBroker || !deps.getControlPlaneRecentEvents) {
-    throw new Error('ControlPlanePanel requires approval/session brokers and recent-event access to be wired at bootstrap.');
-  }
-  return {
-    approvalBroker: deps.approvalBroker,
-    sessionBroker: deps.sessionBroker,
-    getControlPlaneRecentEvents: deps.getControlPlaneRecentEvents,
-  };
-}
-
-export function requireAutomationManager(deps: BuiltinPanelDeps): AutomationManager {
-  if (!deps.automationManager) {
-    throw new Error('SchedulePanel requires an automation manager to be wired at bootstrap.');
-  }
-  return deps.automationManager;
-}
-
-export function requireUiServices(deps: BuiltinPanelDeps): UiRuntimeServices {
-  if (!deps.uiServices) {
-    throw new Error('UI runtime services must be wired at bootstrap for operator panels.');
-  }
-  return deps.uiServices;
-}
-
-export function requirePluginManager(deps: BuiltinPanelDeps): PluginManagerObserver {
-  if (!deps.pluginManager) {
-    throw new Error('Plugin manager must be wired at bootstrap for plugin and security panels.');
-  }
-  return deps.pluginManager;
-}
-
-export function requireHookPanelDeps(deps: BuiltinPanelDeps): {
-  readonly hookDispatcher: Pick<HookDispatcher, 'listHooks' | 'getChains'>;
-  readonly hookWorkbench: HookWorkbench;
-  readonly hookActivityTracker: Pick<HookActivityTracker, 'listRecent'>;
-} {
-  if (!deps.hookDispatcher || !deps.hookWorkbench || !deps.hookActivityTracker) {
-    throw new Error('Hook dispatcher, hook activity tracker, and hook workbench must be wired at bootstrap for the hooks panel.');
-  }
-  return {
-    hookDispatcher: deps.hookDispatcher,
-    hookWorkbench: deps.hookWorkbench,
-    hookActivityTracker: deps.hookActivityTracker,
-  };
-}
-
-export function requireMcpRegistry(deps: BuiltinPanelDeps): McpRegistry {
-  if (!deps.mcpRegistry) {
-    throw new Error('MCP registry must be wired at bootstrap for security panels and MCP workspace commands.');
-  }
-  return deps.mcpRegistry;
-}

package/src/panels/builtin/usage.ts

@@ -1,21 +0,0 @@
-import type { PanelManager } from '../panel-manager.ts';
-import { CostTrackerPanel } from '../cost-tracker-panel.ts';
-import type { ResolvedBuiltinPanelDeps } from './shared.ts';
-import { requireUiServices } from './shared.ts';
-
-export function registerUsagePanels(manager: PanelManager, deps: ResolvedBuiltinPanelDeps): void {
-  if (!deps.getOrchestratorUsage) return;
-
-  const { getOrchestratorUsage, budgetThreshold } = deps;
-  manager.registerType({
-    id: 'cost',
-    name: 'Cost',
-    icon: '$',
-    category: 'monitoring',
-    description: 'Estimated assistant usage costs for this session and explicit delegated work, with budget alerts',
-    factory: () => {
-      const ui = requireUiServices(deps);
-      return new CostTrackerPanel(ui.events.turns, ui.events.agents, getOrchestratorUsage, { budgetThreshold });
-    },
-  });
-}

package/src/panels/builtin-panels.ts

@@ -1,23 +0,0 @@
-import type { PanelManager } from './panel-manager.ts';
-import { resolveBuiltinPanelDeps, type BuiltinPanelDeps } from './builtin/shared.ts';
-import { registerUsagePanels } from './builtin/usage.ts';
-import { registerOperationsPanels } from './builtin/operations.ts';
-import { registerAgentPanels } from './builtin/agent.ts';
-import { registerSessionPanels } from './builtin/session.ts';
-import { registerKnowledgePanels } from './builtin/knowledge.ts';
-
-/**
- * Register all built-in panel types with the given PanelManager.
- *
- * Call this once during application startup, before opening any panels.
- */
-export function registerBuiltinPanels(manager: PanelManager, deps: BuiltinPanelDeps): void {
-  const resolved = resolveBuiltinPanelDeps(deps);
-  registerUsagePanels(manager, resolved);
-  registerOperationsPanels(manager, resolved);
-  registerAgentPanels(manager, resolved);
-  registerSessionPanels(manager, resolved);
-  registerKnowledgePanels(manager, resolved);
-}
-
-export type { BuiltinPanelDeps } from './builtin/shared.ts';

package/src/panels/confirm-state.ts

@@ -1,61 +0,0 @@
-// ---------------------------------------------------------------------------
-// useConfirmState<T> — reusable inline y/n confirmation helper
-//
-// Pattern (chosen over ConfirmableListPanel base class):
-//   - Composable: each panel holds a ConfirmState field, not a new base class
-//   - Identical y/n UX everywhere: y confirms, n/Esc cancels, any other key
-//     is absorbed (does nothing) while confirm is active
-//   - Render: caller calls renderConfirmLines(width, state) to get the two
-//     lines that replace the normal content area when confirming
-// ---------------------------------------------------------------------------
-
-import type { Line } from '../types/grid.ts';
-import { buildPanelLine } from './polish.ts';
-import { DEFAULT_PANEL_PALETTE } from './polish.ts';
-
-export interface ConfirmState<T = string> {
-  /** The subject of the confirmation (e.g. item name or id). */
-  readonly subject: T;
-  /** Human-readable label for the item being destroyed. */
-  readonly label: string;
-}
-
-/**
- * Call this from a panel's handleInput() BEFORE any other key handling.
- *
- * Returns:
- *   - `'confirmed'` — user pressed y; caller must execute the action and
- *     clear state (set confirm to null)
- *   - `'cancelled'` — user pressed n or Esc; caller must clear state
- *   - `'absorbed'`  — any other key while confirm is active; caller returns true
- *   - `'inactive'`  — no confirm pending; caller continues normal dispatch
- */
-export function handleConfirmInput<T = string>(
-  confirm: ConfirmState<T> | null,
-  key: string,
-): 'confirmed' | 'cancelled' | 'absorbed' | 'inactive' {
-  if (!confirm) return 'inactive';
-  if (key === 'y') return 'confirmed';
-  if (key === 'n' || key === 'escape') return 'cancelled';
-  return 'absorbed';
-}
-
-/**
- * Build the two confirmation lines to show in place of the normal list body.
- * Callers embed these lines in a workspace section titled 'Confirmation'.
- */
-export function renderConfirmLines<T = string>(width: number, state: ConfirmState<T>): Line[] {
-  const palette = DEFAULT_PANEL_PALETTE;
-  return [
-    buildPanelLine(width, [[
-      ` Delete "${state.label}"?`,
-      palette.warn,
-    ]]),
-    buildPanelLine(width, [
-      [' y', palette.info],
-      ['  confirm delete', palette.dim],
-      ['   n / Esc', palette.info],
-      ['  cancel', palette.dim],
-    ]),
-  ];
-}