paseo-terminal-integration 0.5.2 → 0.5.4

package/OVERVIEW.md

@@ -10,10 +10,11 @@ accept passwords and confirmations. Background commands have no terminal or inpu
 parallel, and retain more output. Commands only run after the user presses a run button or submits
 the `/run` command.
 
-The settings control whether completed output is sent to the agent by default and how many lines
-make a result start collapsed in the timeline. Optional command guidance can be added to newly
-created agents for either a local-daemon or client-server setup. Both supplied instruction templates
-are editable per host.
+The settings control whether completed output is sent to the agent by default. Sent reports remain
+available to the agent but are hidden from the visible timeline to avoid duplicating the inline run
+status, recent output, and terminal. Optional command guidance can be added to newly created agents
+for either a local-daemon or client-server setup. Both supplied instruction templates are editable
+per host.
 
 The plugin requires Paseo 0.10.1 or later and a macOS or Linux daemon host with `bash`. Python and
 Node.js code blocks also require their corresponding interpreter. Plugins are trusted code; this

package/README.md

@@ -17,8 +17,8 @@ the reply finishes. On other Paseo versions a **Run in terminal** card appears u
 - With **Send output to agent** checked (the default), the command, exit code, and output go to
   the agent as a new message when the block finishes. If the agent is busy, delivery waits until
   its turn ends instead of interrupting it. Unchecked, **Send output** sends it later.
-- Sent output longer than 20 lines starts collapsed. Change the threshold under
-  **Settings → Plugins → Terminal integration**, or set it to 0 to keep output expanded.
+- Sent output remains available to the agent but is hidden from the visible timeline, since the
+  inline run controls and terminal already show the command status and recent output.
 - **Stop** sends Ctrl-C; **Send output so far** reports a still-running command.
 
 **Terminal beside the chat.** On Paseo builds with the terminal open-location setting, choose

package/client/hide-run-report.ts

@@ -0,0 +1,11 @@
+import type { PluginTimelineTransformerContribution } from "@getpaseo/plugin/client";
+import { RUN_REPORT_MARKER } from "../shared/run-report";
+
+type UserMessageTransformer = PluginTimelineTransformerContribution<"user_message">["transform"];
+
+/** Keep the full report available to the agent without repeating it in the visible timeline. */
+export const hideRunReport: UserMessageTransformer = ({ item }) => {
+  if (item.text === RUN_REPORT_MARKER || item.text.startsWith(`${RUN_REPORT_MARKER}\n`)) {
+    return { items: [] };
+  }
+};

package/client/settings-screen.tsx

@@ -3,7 +3,6 @@ import {
   ExternalLink,
   SettingsAction,
   SettingsCard,
-  SettingsInput,
   SettingsRow,
   SettingsSection,
   SettingsSelect,
@@ -40,14 +39,6 @@ function ReadySettingsScreen({
 }) {
   const { values, revision } = settings;
   const [draft, setDraft] = useState(values);
-  const [collapseLinesText, setCollapseLinesText] = useState(
-    String(values.collapseOutputAfterLines),
-  );
-  const collapseLines = /^\d+$/.test(collapseLinesText) ? Number(collapseLinesText) : NaN;
-  const collapseLinesError =
-    Number.isInteger(collapseLines) && collapseLines >= 0 && collapseLines <= 5_000
-      ? null
-      : "Enter a whole number from 0 to 5000.";
   const dirty = useMemo(() => JSON.stringify(draft) !== JSON.stringify(values), [draft, values]);
   const editorStyle = useMemo(
     () => ({
@@ -83,21 +74,6 @@ function ReadySettingsScreen({
             error={settings.saveError}
             onValueChange={(sendToAgent) => setDraft((current) => ({ ...current, sendToAgent }))}
           />
-          <SettingsInput
-            label="Collapse output after this many lines"
-            hint="Long output sent back to the agent starts collapsed. Set 0 to keep all output expanded."
-            initialValue={collapseLinesText}
-            placeholder="20"
-            disabled={settings.saving}
-            error={collapseLinesError}
-            onChangeText={(text) => {
-              setCollapseLinesText(text);
-              const value = /^\d+$/.test(text) ? Number(text) : NaN;
-              if (Number.isInteger(value) && value >= 0 && value <= 5_000) {
-                setDraft((current) => ({ ...current, collapseOutputAfterLines: value }));
-              }
-            }}
-          />
           <SettingsRow
             label="Where the terminal appears"
             hint={`Commands run in the "${TERMINAL_NAME}" terminal tab. Choose Main panel or On the side in Settings → Layout → Open location → Terminals. Manually moved tabs keep their location.`}
@@ -212,10 +188,10 @@ function ReadySettingsScreen({
         <SettingsCard>
           <SettingsAction
             label="Apply changes"
-            hint="Output display changes immediately. Command instructions apply only to newly created agents."
+            hint="Command instructions apply only to newly created agents."
             error={settings.saveError}
             actionLabel={settings.saving ? "Saving…" : "Save changes"}
-            disabled={settings.saving || !dirty || collapseLinesError !== null}
+            disabled={settings.saving || !dirty}
             onPress={() => void settings.save(draft, revision)}
           />
         </SettingsCard>

package/index.client.tsx

@@ -3,8 +3,8 @@ import { contributeLegacy } from "./client/legacy";
 import type { PluginCleanup } from "@getpaseo/plugin";
 import type { InlineActionsClient } from "./client/sdk-compat";
 import { CodeBlockActions } from "./client/code-block-actions";
+import { hideRunReport } from "./client/hide-run-report";
 import { SettingsScreen } from "./client/settings-screen";
-import { RunReport, runReportSchema, transformRunReport } from "./client/run-report";
 import { RUNNABLE_LANGUAGES } from "./shared/code-blocks";
 import { terminalOutputSource } from "./shared/contracts";
 
@@ -12,13 +12,7 @@ export default function contribute(client: InlineActionsClient): PluginCleanup {
   client.addTimelineTransformer({
     id: "terminal-run-report",
     query: { itemType: "user_message" },
-    transform: transformRunReport,
-  });
-  client.addTimelineRenderer({
-    kind: "terminal-run-report",
-    version: 1,
-    schema: runReportSchema,
-    Component: RunReport,
+    transform: hideRunReport,
   });
   if (typeof client.addCodeBlockActions === "function") {
     client.addCodeBlockActions({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paseo-terminal-integration",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "Run agent code blocks in a Paseo terminal and send the output back to the agent; attach terminal output to prompts",
   "keywords": [
     "agents",
@@ -35,9 +35,6 @@
     "lint": "oxlint",
     "format": "oxfmt ."
   },
-  "dependencies": {
-    "@getpaseo/highlight": "0.11.2"
-  },
   "devDependencies": {
     "@getpaseo/plugin": "0.10.2",
     "@tanstack/react-query": "^5.90.11",

package/shared/settings.ts

@@ -4,22 +4,13 @@ import { CLIENT_SERVER_INSTRUCTIONS, LOCAL_DAEMON_INSTRUCTIONS } from "./instruc
 
 export const instructionTopologies = ["local-daemon", "client-server"] as const;
 export type InstructionTopology = (typeof instructionTopologies)[number];
-export const DEFAULT_COLLAPSE_OUTPUT_AFTER_LINES = 20;
-
 export const preferences = defineSettings({
   id: "preferences",
   scope: "host",
-  version: 3,
+  version: 4,
   schema: z.object({
     /** Initial state of a code block's "Send output to agent" checkbox. */
     sendToAgent: z.boolean().default(true),
-    /** Automatically collapse a sent run report when its output exceeds this many lines; 0 disables. */
-    collapseOutputAfterLines: z
-      .number()
-      .int()
-      .min(0)
-      .max(5_000)
-      .default(DEFAULT_COLLAPSE_OUTPUT_AFTER_LINES),
     /** Add command-formatting and execution-topology guidance to newly created agents. */
     injectCommandInstructions: z.boolean().default(false),
     instructionTopology: z.enum(instructionTopologies).default("client-server"),

package/client/run-report.tsx

@@ -1,232 +0,0 @@
-import {
-  useSettings,
-  type PluginTimelineItemProps,
-  type PluginTimelineTransformerContribution,
-} from "@getpaseo/plugin/client";
-import { Icon } from "@getpaseo/plugin/client/react-native";
-import {
-  darkHighlightColors,
-  highlightCode,
-  lightHighlightColors,
-  type HighlightStyle,
-  type HighlightToken,
-} from "@getpaseo/highlight";
-import { useMemo, useState } from "react";
-import { Platform, Pressable, ScrollView, Text, View } from "react-native";
-import {
-  parseRunReport,
-  runReportSchema,
-  wrapRunReportOutcome,
-  type RunReportData,
-} from "../shared/run-report";
-import { DEFAULT_COLLAPSE_OUTPUT_AFTER_LINES, preferences } from "../shared/settings";
-
-type UserMessageTransformer = PluginTimelineTransformerContribution<"user_message">["transform"];
-type Theme = PluginTimelineItemProps["theme"];
-
-export const transformRunReport: UserMessageTransformer = ({ item }) => {
-  const data = parseRunReport(item.text);
-  if (!data) return;
-  return {
-    items: [{ type: "plugin", kind: "terminal-run-report", version: 1, data }],
-  };
-};
-
-export { runReportSchema };
-
-export function RunReport({ item, theme, layout }: PluginTimelineItemProps<RunReportData>) {
-  const settings = useSettings(preferences);
-  const threshold =
-    settings.status === "ready"
-      ? settings.values.collapseOutputAfterLines
-      : DEFAULT_COLLAPSE_OUTPUT_AFTER_LINES;
-  const autoCollapsed = threshold > 0 && item.data.outputLineCount > threshold;
-  const [expandedOverride, setExpandedOverride] = useState<boolean | null>(null);
-  const expanded = expandedOverride ?? !autoCollapsed;
-  const styles = useMemo(() => createStyles(theme, layout.compact), [theme, layout.compact]);
-
-  if (!item.data.output) {
-    return (
-      <View style={styles.card}>
-        <Text style={styles.intro}>{item.data.intro}</Text>
-        <CodeBlock
-          text={item.data.code}
-          language={item.data.language}
-          styles={styles}
-          theme={theme}
-        />
-        <Text style={styles.outputLabel}>{item.data.outputLabel}</Text>
-      </View>
-    );
-  }
-
-  return (
-    <View style={[styles.card, !expanded && styles.collapsedCard]}>
-      <Pressable
-        accessibilityRole="button"
-        accessibilityLabel={`${expanded ? "Collapse" : "Expand"} terminal output`}
-        accessibilityState={{ expanded }}
-        onPress={() => setExpandedOverride(!expanded)}
-        style={({ pressed }) => [styles.reportHeader, pressed && styles.pressed]}
-      >
-        <Icon
-          name={expanded ? "ChevronDown" : "ChevronRight"}
-          size={16}
-          color={theme.colors.foregroundMuted}
-        />
-        <Text style={styles.reportTitle} numberOfLines={expanded ? undefined : 1}>
-          {expanded ? wrapRunReportOutcome(item.data.intro) : item.data.intro}
-        </Text>
-        <Text style={styles.lineCount}>
-          {item.data.outputLineCount} {item.data.outputLineCount === 1 ? "line" : "lines"}
-        </Text>
-      </Pressable>
-      {expanded ? (
-        <>
-          <CodeBlock
-            text={item.data.code}
-            language={item.data.language}
-            styles={styles}
-            theme={theme}
-          />
-          <Text style={styles.outputLabel}>{item.data.outputLabel}</Text>
-          <CodeBlock text={item.data.output} styles={styles} />
-        </>
-      ) : null}
-    </View>
-  );
-}
-
-type Styles = ReturnType<typeof createStyles>;
-
-const MAX_HIGHLIGHT_CHARS = 100_000;
-
-const LANGUAGE_EXTENSIONS: Readonly<Record<string, string>> = {
-  bash: "sh",
-  shell: "sh",
-  console: "sh",
-  zsh: "sh",
-  fish: "sh",
-  python: "py",
-  py: "py",
-  javascript: "js",
-  node: "js",
-  typescript: "ts",
-};
-
-function CodeBlock({
-  text,
-  language,
-  styles,
-  theme,
-}: {
-  text: string;
-  language?: string;
-  styles: Styles;
-  theme?: Theme;
-}) {
-  const highlighted = useMemo(() => highlight(text, language), [language, text]);
-  const colors =
-    theme && isDark(theme.colors.surface0) ? darkHighlightColors : lightHighlightColors;
-
-  return (
-    <ScrollView horizontal style={styles.codeBlock} contentContainerStyle={styles.codeContent}>
-      <Text selectable style={styles.code}>
-        {highlighted
-          ? highlighted.map((line, lineIndex) => (
-              <Text key={lineIndex}>
-                {line.map((token, tokenIndex) => (
-                  <Text
-                    key={`${lineIndex}-${tokenIndex}`}
-                    style={{ color: tokenColor(token, colors, theme?.colors.foreground) }}
-                  >
-                    {token.text}
-                  </Text>
-                ))}
-                {lineIndex < highlighted.length - 1 ? "\n" : null}
-              </Text>
-            ))
-          : text}
-      </Text>
-    </ScrollView>
-  );
-}
-
-function highlight(text: string, language?: string): HighlightToken[][] | null {
-  if (!language || text.length > MAX_HIGHLIGHT_CHARS) return null;
-  const normalized = language.toLowerCase();
-  const extension = LANGUAGE_EXTENSIONS[normalized] ?? normalized;
-  try {
-    return highlightCode(text, `command.${extension}`);
-  } catch {
-    return null;
-  }
-}
-
-function tokenColor(
-  token: HighlightToken,
-  colors: Readonly<Record<HighlightStyle, string>>,
-  fallback = "inherit",
-): string {
-  return token.style ? colors[token.style] : fallback;
-}
-
-function isDark(color: string): boolean {
-  const match = /^#([0-9a-f]{6})$/i.exec(color);
-  if (!match) return true;
-  const value = Number.parseInt(match[1], 16);
-  const red = value >> 16;
-  const green = (value >> 8) & 0xff;
-  const blue = value & 0xff;
-  return red * 0.299 + green * 0.587 + blue * 0.114 < 128;
-}
-
-function createStyles(theme: Theme, compact: boolean) {
-  return {
-    card: {
-      gap: 10,
-      padding: compact ? 12 : 14,
-      borderWidth: 1,
-      borderColor: theme.colors.border,
-      borderRadius: 12,
-      backgroundColor: theme.colors.surface1,
-    },
-    collapsedCard: { gap: 0, padding: 4 },
-    intro: { color: theme.colors.foreground, fontSize: 14, lineHeight: 20 },
-    reportHeader: {
-      minHeight: 36,
-      flexDirection: "row" as const,
-      alignItems: "center" as const,
-      gap: 6,
-      paddingHorizontal: 8,
-      borderRadius: 6,
-    },
-    pressed: { opacity: 0.7 },
-    reportTitle: {
-      flex: 1,
-      color: theme.colors.foreground,
-      fontSize: 13,
-      lineHeight: 18,
-    },
-    outputLabel: { flexShrink: 1, color: theme.colors.foreground, fontSize: 13 },
-    lineCount: { marginLeft: "auto" as const, color: theme.colors.foregroundMuted, fontSize: 12 },
-    codeBlock: {
-      maxWidth: "100%" as const,
-      borderWidth: 1,
-      borderColor: theme.colors.border,
-      borderRadius: 8,
-      backgroundColor: theme.colors.surface0,
-    },
-    codeContent: { paddingHorizontal: 10, paddingVertical: 8 },
-    code: {
-      color: theme.colors.foreground,
-      fontSize: 12,
-      lineHeight: 18,
-      fontFamily: Platform.select({
-        ios: "Menlo",
-        android: "monospace",
-        default: "ui-monospace, SFMono-Regular, Menlo, Consolas, monospace",
-      }),
-    },
-  };
-}