@oh-my-pi/pi-coding-agent 3.24.0 → 3.25.0

package/src/core/tools/task/name-generator.ts

@@ -0,0 +1,247 @@
+/**
+ * Generate memorable two-word task identifiers.
+ * Format: AdjectiveNoun (e.g., "SwiftFalcon", "CalmPanda")
+ *
+ * Dictionaries sourced from unique-names-generator (MIT license).
+ * 1202 adjectives × 355 animals = 426,710 combinations.
+ */
+
+const ADJECTIVES = [
+   "able", "above", "absent", "absolute", "abstract", "abundant", "academic", "acceptable",
+   "accepted", "accessible", "accurate", "accused", "active", "actual", "acute", "added",
+   "additional", "adequate", "adjacent", "administrative", "adorable", "advanced", "adverse",
+   "advisory", "aesthetic", "afraid", "aggregate", "aggressive", "agreeable", "agreed",
+   "agricultural", "alert", "alive", "alleged", "allied", "alone", "alright", "alternative",
+   "amateur", "amazing", "ambitious", "amused", "ancient", "angry", "annoyed", "annual",
+   "anonymous", "anxious", "appalling", "apparent", "applicable", "appropriate", "arbitrary",
+   "architectural", "armed", "arrogant", "artificial", "artistic", "ashamed", "asleep",
+   "assistant", "associated", "atomic", "attractive", "automatic", "autonomous", "available",
+   "average", "awake", "aware", "awful", "awkward", "back", "bad", "balanced", "bare", "basic",
+   "beautiful", "beneficial", "better", "bewildered", "big", "binding", "biological", "bitter",
+   "bizarre", "blank", "blind", "blonde", "bloody", "blushing", "boiling", "bold", "bored",
+   "boring", "bottom", "brainy", "brave", "breakable", "breezy", "brief", "bright", "brilliant",
+   "broad", "broken", "bumpy", "burning", "busy", "calm", "capable", "capitalist", "careful",
+   "casual", "causal", "cautious", "central", "certain", "changing", "characteristic", "charming",
+   "cheap", "cheerful", "chemical", "chief", "chilly", "chosen", "chronic", "chubby", "circular",
+   "civic", "civil", "civilian", "classic", "classical", "clean", "clear", "clever", "clinical",
+   "close", "closed", "cloudy", "clumsy", "coastal", "cognitive", "coherent", "cold", "collective",
+   "colonial", "colorful", "colossal", "coloured", "colourful", "combative", "combined",
+   "comfortable", "coming", "commercial", "common", "communist", "compact", "comparable",
+   "comparative", "compatible", "competent", "competitive", "complete", "complex", "complicated",
+   "comprehensive", "compulsory", "conceptual", "concerned", "concrete", "condemned", "confident",
+   "confidential", "confused", "conscious", "conservation", "conservative", "considerable",
+   "consistent", "constant", "constitutional", "contemporary", "content", "continental",
+   "continued", "continuing", "continuous", "controlled", "controversial", "convenient",
+   "conventional", "convinced", "convincing", "cooing", "cool", "cooperative", "corporate",
+   "correct", "corresponding", "costly", "courageous", "crazy", "creative", "creepy", "criminal",
+   "critical", "crooked", "crowded", "crucial", "crude", "cruel", "cuddly", "cultural", "curious",
+   "curly", "current", "curved", "cute", "daily", "damaged", "damp", "dangerous", "dark", "dead",
+   "deaf", "deafening", "dear", "decent", "decisive", "deep", "defeated", "defensive", "defiant",
+   "definite", "deliberate", "delicate", "delicious", "delighted", "delightful", "democratic",
+   "dependent", "depressed", "desirable", "desperate", "detailed", "determined", "developed",
+   "developing", "devoted", "different", "difficult", "digital", "diplomatic", "direct", "dirty",
+   "disabled", "disappointed", "disastrous", "disciplinary", "disgusted", "distant", "distinct",
+   "distinctive", "distinguished", "disturbed", "disturbing", "diverse", "divine", "dizzy",
+   "domestic", "dominant", "double", "doubtful", "drab", "dramatic", "dreadful", "driving",
+   "drunk", "dry", "dual", "due", "dull", "dusty", "dying", "dynamic", "eager", "early", "eastern",
+   "easy", "economic", "educational", "eerie", "effective", "efficient", "elaborate", "elated",
+   "elderly", "eldest", "electoral", "electric", "electrical", "electronic", "elegant", "eligible",
+   "embarrassed", "embarrassing", "emotional", "empirical", "empty", "enchanting", "encouraging",
+   "endless", "energetic", "enormous", "enthusiastic", "entire", "entitled", "envious",
+   "environmental", "equal", "equivalent", "essential", "established", "estimated", "ethical",
+   "ethnic", "eventual", "everyday", "evident", "evil", "evolutionary", "exact", "excellent",
+   "exceptional", "excess", "excessive", "excited", "exciting", "exclusive", "existing", "exotic",
+   "expected", "expensive", "experienced", "experimental", "explicit", "extended", "extensive",
+   "external", "extra", "extraordinary", "extreme", "exuberant", "faint", "fair", "faithful",
+   "familiar", "famous", "fancy", "fantastic", "far", "fascinating", "fashionable", "fast", "fat",
+   "fatal", "favourable", "favourite", "federal", "fellow", "female", "feminist", "few", "fierce",
+   "filthy", "final", "financial", "fine", "firm", "fiscal", "fit", "fixed", "flaky", "flat",
+   "flexible", "fluffy", "fluttering", "flying", "following", "fond", "foolish", "foreign",
+   "formal", "formidable", "forthcoming", "fortunate", "forward", "fragile", "frail", "frantic",
+   "free", "frequent", "fresh", "friendly", "frightened", "front", "frozen", "full", "fun",
+   "functional", "fundamental", "funny", "furious", "future", "fuzzy", "gastric", "gay", "general",
+   "generous", "genetic", "gentle", "genuine", "geographical", "giant", "gigantic", "given",
+   "glad", "glamorous", "gleaming", "global", "glorious", "golden", "good", "gorgeous", "gothic",
+   "governing", "graceful", "gradual", "grand", "grateful", "greasy", "great", "grieving", "grim",
+   "gross", "grotesque", "growing", "grubby", "grumpy", "guilty", "handicapped", "handsome",
+   "happy", "hard", "harsh", "head", "healthy", "heavy", "helpful", "helpless", "hidden", "high",
+   "hilarious", "hissing", "historic", "historical", "hollow", "holy", "homeless", "homely",
+   "honest", "horizontal", "horrible", "hostile", "hot", "huge", "human", "hungry", "hurt",
+   "hushed", "husky", "icy", "ideal", "identical", "ideological", "ill", "illegal", "imaginative",
+   "immediate", "immense", "imperial", "implicit", "important", "impossible", "impressed",
+   "impressive", "improved", "inadequate", "inappropriate", "inclined", "increased", "increasing",
+   "incredible", "independent", "indirect", "individual", "industrial", "inevitable", "influential",
+   "informal", "inherent", "initial", "injured", "inland", "inner", "innocent", "innovative",
+   "inquisitive", "instant", "institutional", "insufficient", "intact", "integral", "integrated",
+   "intellectual", "intelligent", "intense", "intensive", "interested", "interesting", "interim",
+   "interior", "intermediate", "internal", "international", "intimate", "invisible", "involved",
+   "irrelevant", "isolated", "itchy", "jealous", "jittery", "joint", "jolly", "joyous", "judicial",
+   "juicy", "junior", "just", "keen", "key", "kind", "known", "labour", "large", "late", "latin",
+   "lazy", "leading", "left", "legal", "legislative", "legitimate", "lengthy", "lesser", "level",
+   "lexical", "liable", "liberal", "light", "like", "likely", "limited", "linear", "linguistic",
+   "liquid", "literary", "little", "live", "lively", "living", "local", "logical", "lonely",
+   "long", "loose", "lost", "loud", "lovely", "low", "loyal", "lucky", "mad", "magic", "magnetic",
+   "magnificent", "main", "major", "male", "mammoth", "managerial", "managing", "manual", "many",
+   "marginal", "marine", "marked", "married", "marvellous", "marxist", "mass", "massive",
+   "mathematical", "mature", "maximum", "mean", "meaningful", "mechanical", "medical", "medieval",
+   "melodic", "melted", "mental", "mere", "metropolitan", "mid", "middle", "mighty", "mild",
+   "military", "miniature", "minimal", "minimum", "ministerial", "minor", "miserable", "misleading",
+   "missing", "misty", "mixed", "moaning", "mobile", "moderate", "modern", "modest", "molecular",
+   "monetary", "monthly", "moral", "motionless", "muddy", "multiple", "mushy", "musical", "mute",
+   "mutual", "mysterious", "naked", "narrow", "nasty", "national", "native", "natural", "naughty",
+   "naval", "near", "nearby", "neat", "necessary", "negative", "neighbouring", "nervous", "net",
+   "neutral", "new", "nice", "noble", "noisy", "normal", "northern", "nosy", "notable", "novel",
+   "nuclear", "numerous", "nursing", "nutritious", "nutty", "obedient", "objective", "obliged",
+   "obnoxious", "obvious", "occasional", "occupational", "odd", "official", "old", "olympic",
+   "only", "open", "operational", "opposite", "optimistic", "oral", "ordinary", "organic",
+   "organisational", "original", "orthodox", "other", "outdoor", "outer", "outrageous", "outside",
+   "outstanding", "overall", "overseas", "overwhelming", "painful", "pale", "panicky", "parallel",
+   "parental", "parliamentary", "partial", "particular", "passing", "passive", "past", "patient",
+   "payable", "peaceful", "peculiar", "perfect", "permanent", "persistent", "personal", "petite",
+   "philosophical", "physical", "plain", "planned", "plastic", "pleasant", "pleased", "poised",
+   "polite", "political", "poor", "popular", "positive", "possible", "potential", "powerful",
+   "practical", "precious", "precise", "preferred", "pregnant", "preliminary", "premier",
+   "prepared", "present", "presidential", "pretty", "previous", "prickly", "primary", "prime",
+   "primitive", "principal", "printed", "prior", "private", "probable", "productive", "professional",
+   "profitable", "profound", "progressive", "prominent", "promising", "proper", "proposed",
+   "prospective", "protective", "proud", "provincial", "psychiatric", "psychological", "public",
+   "puny", "pure", "purring", "puzzled", "quaint", "qualified", "quarrelsome", "querulous",
+   "quick", "quickest", "quiet", "quintessential", "quixotic", "racial", "radical", "rainy",
+   "random", "rapid", "rare", "raspy", "rational", "ratty", "raw", "ready", "real", "realistic",
+   "rear", "reasonable", "recent", "reduced", "redundant", "regional", "registered", "regular",
+   "regulatory", "related", "relative", "relaxed", "relevant", "reliable", "relieved", "religious",
+   "reluctant", "remaining", "remarkable", "remote", "renewed", "representative", "repulsive",
+   "required", "resident", "residential", "resonant", "respectable", "respective", "responsible",
+   "resulting", "retail", "retired", "revolutionary", "rich", "ridiculous", "right", "rigid",
+   "ripe", "rising", "rival", "roasted", "robust", "rolling", "romantic", "rotten", "rough",
+   "round", "royal", "rubber", "rude", "ruling", "running", "rural", "sacred", "sad", "safe",
+   "salty", "satisfactory", "satisfied", "scared", "scary", "scattered", "scientific", "scornful",
+   "scrawny", "screeching", "secondary", "secret", "secure", "select", "selected", "selective",
+   "selfish", "semantic", "senior", "sensible", "sensitive", "separate", "serious", "severe",
+   "sexual", "shaggy", "shaky", "shallow", "shared", "sharp", "sheer", "shiny", "shivering",
+   "shocked", "short", "shrill", "shy", "sick", "significant", "silent", "silky", "silly",
+   "similar", "simple", "single", "skilled", "skinny", "sleepy", "slight", "slim", "slimy",
+   "slippery", "slow", "small", "smart", "smiling", "smoggy", "smooth", "social", "socialist",
+   "soft", "solar", "sole", "solid", "sophisticated", "sore", "sorry", "sound", "sour", "southern",
+   "soviet", "spare", "sparkling", "spatial", "special", "specific", "specified", "spectacular",
+   "spicy", "spiritual", "splendid", "spontaneous", "sporting", "spotless", "spotty", "square",
+   "squealing", "stable", "stale", "standard", "static", "statistical", "statutory", "steady",
+   "steep", "sticky", "stiff", "still", "stingy", "stormy", "straight", "straightforward",
+   "strange", "strategic", "strict", "striking", "striped", "strong", "structural", "stuck",
+   "stupid", "subjective", "subsequent", "substantial", "subtle", "successful", "successive",
+   "sudden", "sufficient", "suitable", "sunny", "super", "superb", "superior", "supporting",
+   "supposed", "supreme", "sure", "surprised", "surprising", "surrounding", "surviving",
+   "suspicious", "sweet", "swift", "symbolic", "sympathetic", "systematic", "tall", "tame",
+   "tart", "tasteless", "tasty", "technical", "technological", "teenage", "temporary", "tender",
+   "tense", "terrible", "territorial", "testy", "theoretical", "thick", "thin", "thirsty",
+   "thorough", "thoughtful", "thoughtless", "thundering", "tight", "tiny", "tired", "top", "total",
+   "tough", "toxic", "traditional", "tragic", "tremendous", "tricky", "tropical", "troubled",
+   "typical", "ugliest", "ugly", "ultimate", "unable", "unacceptable", "unaware", "uncertain",
+   "unchanged", "uncomfortable", "unconscious", "underground", "underlying", "unemployed",
+   "uneven", "unexpected", "unfair", "unfortunate", "unhappy", "uniform", "uninterested", "unique",
+   "united", "universal", "unknown", "unlikely", "unnecessary", "unpleasant", "unsightly",
+   "unusual", "unwilling", "upper", "upset", "uptight", "urban", "urgent", "used", "useful",
+   "useless", "usual", "vague", "valid", "valuable", "variable", "varied", "various", "varying",
+   "vast", "verbal", "vertical", "vicarious", "vicious", "victorious", "violent", "visible",
+   "visiting", "visual", "vital", "vivacious", "vivid", "vocal", "vocational", "voiceless",
+   "voluminous", "voluntary", "vulnerable", "wandering", "warm", "wasteful", "watery", "weak",
+   "wealthy", "weary", "weekly", "weird", "welcome", "well", "western", "wet", "whispering",
+   "whole", "wicked", "wide", "widespread", "wild", "willing", "willowy", "wily", "wise", "wispy",
+   "witty", "wonderful", "wooden", "working", "worldwide", "worried", "worrying", "worthwhile",
+   "worthy", "written", "wrong", "xenial", "xeric", "yawning", "yearning", "young", "youngest",
+   "youthful", "zany", "zealous", "zesty", "zippy",
+];
+
+const NOUNS = [
+   "aardvark", "aardwolf", "albatross", "alligator", "alpaca", "amphibian", "anaconda",
+   "angelfish", "anglerfish", "ant", "anteater", "antelope", "antlion", "ape", "aphid",
+   "armadillo", "asp", "baboon", "badger", "bandicoot", "barnacle", "barracuda", "basilisk",
+   "bass", "bat", "bear", "beaver", "bedbug", "bee", "beetle", "bird", "bison", "blackbird",
+   "boa", "boar", "bobcat", "bobolink", "bonobo", "booby", "bovid", "bug", "butterfly", "buzzard",
+   "camel", "canid", "capybara", "cardinal", "caribou", "carp", "cat", "caterpillar", "catfish",
+   "catshark", "cattle", "centipede", "cephalopod", "chameleon", "cheetah", "chickadee", "chicken",
+   "chimpanzee", "chinchilla", "chipmunk", "cicada", "clam", "clownfish", "cobra", "cockroach",
+   "cod", "condor", "constrictor", "coral", "cougar", "cow", "coyote", "crab", "crane", "crawdad",
+   "crayfish", "cricket", "crocodile", "crow", "cuckoo", "damselfly", "deer", "dingo", "dinosaur",
+   "dog", "dolphin", "donkey", "dormouse", "dove", "dragon", "dragonfly", "duck", "eagle",
+   "earthworm", "earwig", "echidna", "eel", "egret", "elephant", "elk", "emu", "ermine", "falcon",
+   "ferret", "finch", "firefly", "fish", "flamingo", "flea", "fly", "flyingfish", "fowl", "fox",
+   "frog", "gamefowl", "gazelle", "gecko", "gerbil", "gibbon", "giraffe", "goat", "goldfish",
+   "goose", "gopher", "gorilla", "grasshopper", "grouse", "guan", "guanaco", "guineafowl", "gull",
+   "guppy", "haddock", "halibut", "hamster", "hare", "harrier", "hawk", "hedgehog", "heron",
+   "herring", "hippopotamus", "hookworm", "hornet", "horse", "hoverfly", "hummingbird", "hyena",
+   "iguana", "impala", "jackal", "jaguar", "jay", "jellyfish", "kangaroo", "kingfisher", "kite",
+   "kiwi", "koala", "koi", "krill", "ladybug", "lamprey", "lark", "leech", "lemming", "lemur",
+   "leopard", "leopon", "limpet", "lion", "lizard", "llama", "lobster", "locust", "loon", "louse",
+   "lungfish", "lynx", "macaw", "mackerel", "magpie", "mammal", "manatee", "mandrill", "marlin",
+   "marmoset", "marmot", "marsupial", "marten", "mastodon", "meadowlark", "meerkat", "mink",
+   "minnow", "mite", "mockingbird", "mole", "mollusk", "mongoose", "monkey", "moose", "mosquito",
+   "moth", "mouse", "mule", "muskox", "narwhal", "newt", "nightingale", "ocelot", "octopus",
+   "opossum", "orangutan", "orca", "ostrich", "otter", "owl", "ox", "panda", "panther", "parakeet",
+   "parrot", "parrotfish", "partridge", "peacock", "peafowl", "pelican", "penguin", "perch",
+   "pheasant", "pig", "pigeon", "pike", "pinniped", "piranha", "planarian", "platypus", "pony",
+   "porcupine", "porpoise", "possum", "prawn", "primate", "ptarmigan", "puffin", "puma", "python",
+   "quail", "quelea", "quokka", "rabbit", "raccoon", "rat", "rattlesnake", "raven", "reindeer",
+   "reptile", "rhinoceros", "roadrunner", "rodent", "rook", "rooster", "roundworm", "sailfish",
+   "salamander", "salmon", "sawfish", "scallop", "scorpion", "seahorse", "shark", "sheep", "shrew",
+   "shrimp", "silkworm", "silverfish", "skink", "skunk", "sloth", "slug", "smelt", "snail",
+   "snake", "snipe", "sole", "sparrow", "spider", "spoonbill", "squid", "squirrel", "starfish",
+   "stingray", "stoat", "stork", "sturgeon", "swallow", "swan", "swift", "swordfish", "swordtail",
+   "tahr", "takin", "tapir", "tarantula", "tarsier", "termite", "tern", "thrush", "tick", "tiger",
+   "tiglon", "toad", "tortoise", "toucan", "trout", "tuna", "turkey", "turtle", "tyrannosaurus",
+   "unicorn", "urial", "vicuna", "viper", "vole", "vulture", "wallaby", "walrus", "warbler",
+   "wasp", "weasel", "whale", "whippet", "whitefish", "wildcat", "wildebeest", "wildfowl", "wolf",
+   "wolverine", "wombat", "woodpecker", "worm", "wren", "yak", "zebra",
+];
+
+function capitalize(s: string): string {
+   return s.charAt(0).toUpperCase() + s.slice(1);
+}
+
+let usedNames = new Set<string>();
+
+/**
+ * Generate a unique two-word identifier (e.g., "SwiftFalcon").
+ * Falls back to numeric suffix if all combinations exhausted.
+ */
+export function generateTaskName(): string {
+   // Try random combinations first (50 attempts)
+   for (let attempt = 0; attempt < 50; attempt++) {
+      const adj = ADJECTIVES[Math.floor(Math.random() * ADJECTIVES.length)];
+      const noun = NOUNS[Math.floor(Math.random() * NOUNS.length)];
+      const name = `${capitalize(adj)}${capitalize(noun)}`;
+      if (!usedNames.has(name)) {
+         usedNames.add(name);
+         return name;
+      }
+   }
+
+   // Exhaustive search if random fails
+   for (const adj of ADJECTIVES) {
+      for (const noun of NOUNS) {
+         const name = `${capitalize(adj)}${capitalize(noun)}`;
+         if (!usedNames.has(name)) {
+            usedNames.add(name);
+            return name;
+         }
+      }
+   }
+
+   // All 426k combinations used, add numeric suffix
+   let counter = 0;
+   while (true) {
+      const name = `Task${counter}`;
+      if (!usedNames.has(name)) {
+         usedNames.add(name);
+         return name;
+      }
+      counter++;
+   }
+}
+
+/**
+ * Reset name generator state (for testing).
+ */
+export function resetTaskNames(): void {
+   usedNames = new Set<string>();
+}

package/src/core/tools/task/render.ts

@@ -69,6 +69,118 @@ function formatFindingSummary(findings: ReportFindingDetails[], theme: Theme): s
 	return `${theme.fg("dim", "Findings:")} ${parts.join(theme.sep.dot)}`;
 }
 
+function formatJsonScalar(value: unknown): string {
+	if (value === null) return "null";
+	if (typeof value === "string") return `"${value}"`;
+	if (typeof value === "number" || typeof value === "boolean") return String(value);
+	return "";
+}
+
+function buildTreePrefix(ancestors: boolean[], theme: Theme): string {
+	return ancestors.map((hasNext) => (hasNext ? `${theme.tree.vertical}  ` : "   ")).join("");
+}
+
+function renderJsonTreeLines(
+	value: unknown,
+	theme: Theme,
+	maxDepth: number,
+	maxLines: number,
+): { lines: string[]; truncated: boolean } {
+	const lines: string[] = [];
+	let truncated = false;
+
+	const iconObject = theme.styledSymbol("icon.folder", "muted");
+	const iconArray = theme.styledSymbol("icon.package", "muted");
+	const iconScalar = theme.styledSymbol("icon.file", "muted");
+
+	const pushLine = (line: string) => {
+		if (lines.length >= maxLines) {
+			truncated = true;
+			return false;
+		}
+		lines.push(line);
+		return true;
+	};
+
+	const renderNode = (val: unknown, key: string | undefined, ancestors: boolean[], isLast: boolean, depth: number) => {
+		if (lines.length >= maxLines) {
+			truncated = true;
+			return;
+		}
+
+		const connector = isLast ? theme.tree.last : theme.tree.branch;
+		const prefix = `${buildTreePrefix(ancestors, theme)}${theme.fg("dim", connector)} `;
+		const scalar = formatJsonScalar(val);
+
+		if (scalar) {
+			const label = key ? theme.fg("muted", key) : theme.fg("muted", "value");
+			pushLine(`${prefix}${iconScalar} ${label}: ${theme.fg("dim", scalar)}`);
+			return;
+		}
+
+		if (Array.isArray(val)) {
+			const header = key ? theme.fg("muted", key) : theme.fg("muted", "array");
+			pushLine(`${prefix}${iconArray} ${header}`);
+			if (val.length === 0) {
+				pushLine(
+					`${buildTreePrefix([...ancestors, !isLast], theme)}${theme.fg("dim", theme.tree.hook)} ${theme.fg("dim", "[]")}`,
+				);
+				return;
+			}
+			if (depth >= maxDepth) {
+				pushLine(
+					`${buildTreePrefix([...ancestors, !isLast], theme)}${theme.fg("dim", theme.tree.hook)} ${theme.fg("dim", theme.format.ellipsis)}`,
+				);
+				return;
+			}
+			const nextAncestors = [...ancestors, !isLast];
+			for (let i = 0; i < val.length; i++) {
+				renderNode(val[i], `[${i}]`, nextAncestors, i === val.length - 1, depth + 1);
+				if (lines.length >= maxLines) {
+					truncated = true;
+					return;
+				}
+			}
+			return;
+		}
+
+		if (val && typeof val === "object") {
+			const header = key ? theme.fg("muted", key) : theme.fg("muted", "object");
+			pushLine(`${prefix}${iconObject} ${header}`);
+			const entries = Object.entries(val as Record<string, unknown>);
+			if (entries.length === 0) {
+				pushLine(
+					`${buildTreePrefix([...ancestors, !isLast], theme)}${theme.fg("dim", theme.tree.hook)} ${theme.fg("dim", "{}")}`,
+				);
+				return;
+			}
+			if (depth >= maxDepth) {
+				pushLine(
+					`${buildTreePrefix([...ancestors, !isLast], theme)}${theme.fg("dim", theme.tree.hook)} ${theme.fg("dim", theme.format.ellipsis)}`,
+				);
+				return;
+			}
+			const nextAncestors = [...ancestors, !isLast];
+			for (let i = 0; i < entries.length; i++) {
+				const [childKey, child] = entries[i];
+				renderNode(child, childKey, nextAncestors, i === entries.length - 1, depth + 1);
+				if (lines.length >= maxLines) {
+					truncated = true;
+					return;
+				}
+			}
+			return;
+		}
+
+		const label = key ? theme.fg("muted", key) : theme.fg("muted", "value");
+		pushLine(`${prefix}${iconScalar} ${label}: ${theme.fg("dim", String(val))}`);
+	};
+
+	renderNode(value, undefined, [], true, 0);
+
+	return { lines, truncated };
+}
+
 function renderOutputSection(
 	output: string,
 	continuePrefix: string,
@@ -78,11 +190,30 @@ function renderOutputSection(
 	maxExpanded = 10,
 ): string[] {
 	const lines: string[] = [];
-	const outputLines = output.split("\n").filter((line) => line.trim());
-	if (outputLines.length === 0) return lines;
+	const trimmedOutput = output.trim();
+	if (!trimmedOutput) return lines;
 
 	lines.push(`${continuePrefix}${theme.fg("dim", "Output")}`);
 
+	if (trimmedOutput.startsWith("{") || trimmedOutput.startsWith("[")) {
+		try {
+			const parsed = JSON.parse(trimmedOutput);
+			const tree = renderJsonTreeLines(parsed, theme, expanded ? 6 : 2, expanded ? 24 : 6);
+			if (tree.lines.length > 0) {
+				for (const line of tree.lines) {
+					lines.push(`${continuePrefix}  ${line}`);
+				}
+				if (tree.truncated) {
+					lines.push(`${continuePrefix}  ${theme.fg("dim", theme.format.ellipsis)}`);
+				}
+				return lines;
+			}
+		} catch {
+			// Fall back to raw output
+		}
+	}
+
+	const outputLines = output.split("\n").filter((line) => line.trim());
 	const previewCount = expanded ? maxExpanded : maxCollapsed;
 	for (const line of outputLines.slice(0, previewCount)) {
 		lines.push(`${continuePrefix}  ${theme.fg("dim", truncate(line, 70, theme.format.ellipsis))}`);
@@ -144,9 +275,8 @@ function renderAgentProgress(
 				? "error"
 				: "accent";
 
-	// Main status line - include index for Output tool ID derivation
-	const agentId = `${progress.agent}(${progress.index})`;
-	let statusLine = `${prefix} ${theme.fg(iconColor, icon)} ${theme.fg("accent", agentId)}`;
+	// Main status line - use taskId for Output tool
+	let statusLine = `${prefix} ${theme.fg(iconColor, icon)} ${theme.fg("accent", progress.taskId)}`;
 	const description = progress.description?.trim();
 	if (description) {
 		statusLine += ` ${theme.fg("muted", truncate(description, 40, theme.format.ellipsis))}`;
@@ -342,9 +472,8 @@ function renderAgentResult(result: SingleResult, isLast: boolean, expanded: bool
 	const iconColor = success ? "success" : "error";
 	const statusText = aborted ? "aborted" : success ? "done" : "failed";
 
-	// Main status line - include index for Output tool ID derivation
-	const agentId = `${result.agent}(${result.index})`;
-	let statusLine = `${prefix} ${theme.fg(iconColor, icon)} ${theme.fg("accent", agentId)} ${formatBadge(statusText, iconColor, theme)}`;
+	// Main status line - use taskId for Output tool
+	let statusLine = `${prefix} ${theme.fg(iconColor, icon)} ${theme.fg("accent", result.taskId)} ${formatBadge(statusText, iconColor, theme)}`;
 	const description = result.description?.trim();
 	if (description) {
 		statusLine += ` ${theme.fg("muted", truncate(description, 40, theme.format.ellipsis))}`;

package/src/core/tools/task/types.ts

@@ -38,6 +38,11 @@ export type TaskItem = Static<typeof taskItemSchema>;
 /** Task tool parameters */
 export const taskSchema = Type.Object({
 	context: Type.Optional(Type.String({ description: "Shared context prepended to all task prompts" })),
+	output_schema: Type.Optional(
+		Type.Any({
+			description: "JSON schema for structured subagent output (used by the complete tool)",
+		}),
+	),
 	tasks: Type.Array(taskItemSchema, {
 		description: "Tasks to run in parallel",
 		maxItems: MAX_PARALLEL_TASKS,
@@ -85,6 +90,7 @@ export interface AgentDefinition {
 /** Progress tracking for a single agent */
 export interface AgentProgress {
 	index: number;
+	taskId: string;
 	agent: string;
 	agentSource: AgentSource;
 	status: "pending" | "running" | "completed" | "failed" | "aborted";
@@ -106,6 +112,7 @@ export interface AgentProgress {
 /** Result from a single agent execution */
 export interface SingleResult {
 	index: number;
+	taskId: string;
 	agent: string;
 	agentSource: AgentSource;
 	task: string;

package/src/core/tools/task/worker-protocol.ts

@@ -6,6 +6,7 @@ export interface SubagentWorkerStartPayload {
 	systemPrompt: string;
 	model?: string;
 	toolNames?: string[];
+	outputSchema?: unknown;
 	sessionFile?: string | null;
 	spawnsEnv?: string;
 }

package/src/core/tools/task/worker.ts

@@ -123,6 +123,9 @@ async function runTask(payload: SubagentWorkerStartPayload): Promise<void> {
 
 		// Create agent session (equivalent to CLI's createAgentSession)
 		// Note: hasUI: false disables interactive features
+		const completionInstruction =
+			"When finished, call the complete tool exactly once. Do not end with a plain-text final answer.";
+
 		const { session } = await createAgentSession({
 			cwd: payload.cwd,
 			authStorage,
@@ -130,8 +133,10 @@ async function runTask(payload: SubagentWorkerStartPayload): Promise<void> {
 			model,
 			thinkingLevel,
 			toolNames: payload.toolNames,
+			outputSchema: payload.outputSchema,
+			requireCompleteTool: true,
 			// Append system prompt (equivalent to CLI's --append-system-prompt)
-			systemPrompt: (defaultPrompt) => `${defaultPrompt}\n\n${payload.systemPrompt}`,
+			systemPrompt: (defaultPrompt) => `${defaultPrompt}\n\n${payload.systemPrompt}\n\n${completionInstruction}`,
 			sessionManager,
 			hasUI: false,
 			// Pass spawn restrictions to nested tasks
@@ -164,16 +169,43 @@ async function runTask(payload: SubagentWorkerStartPayload): Promise<void> {
 			await extensionRunner.emit({ type: "session_start" });
 		}
 
+		// Track complete tool calls
+		const MAX_COMPLETE_RETRIES = 3;
+		let completeCalled = false;
+
 		// Subscribe to events and forward to parent (equivalent to --mode json output)
 		session.subscribe((event: AgentSessionEvent) => {
 			if (isAgentEvent(event)) {
 				postMessageSafe({ type: "event", event });
+				// Track when complete tool is called
+				if (event.type === "tool_execution_end" && event.toolName === "complete") {
+					completeCalled = true;
+				}
 			}
 		});
 
 		// Run the prompt (equivalent to --prompt flag)
 		await session.prompt(payload.task);
 
+		// Retry loop if complete was not called
+		let retryCount = 0;
+		while (!completeCalled && retryCount < MAX_COMPLETE_RETRIES && !abortRequested) {
+			retryCount++;
+			const reminder = `<system-reminder>
+CRITICAL: You stopped without calling the complete tool. This is reminder ${retryCount} of ${MAX_COMPLETE_RETRIES}.
+
+You MUST call the complete tool to finish your task. Options:
+1. Call complete with your result data if you have completed the task
+2. Call complete with status="aborted" and an error message if you cannot complete the task
+
+Failure to call complete after ${MAX_COMPLETE_RETRIES} reminders will result in task failure.
+</system-reminder>
+
+Call complete now.`;
+
+			await session.prompt(reminder);
+		}
+
 		// Check if aborted during execution
 		const lastMessage = session.state.messages[session.state.messages.length - 1];
 		if (lastMessage?.role === "assistant" && lastMessage.stopReason === "aborted") {

package/src/prompts/task.md

@@ -1,50 +1,14 @@
-You are a worker agent for delegated tasks. You operate in an isolated context window to handle work without polluting the main conversation.
-
-Do what has been asked; nothing more, nothing less. Work autonomously using all available tools.
-
-Your strengths:
-
-- Searching for code, configurations, and patterns across large codebases
-- Analyzing multiple files to understand system architecture
-- Investigating complex questions that require exploring many files
-- Performing multi-step research and implementation tasks
-
-Guidelines:
-
-- Persist until the task is fully resolved end-to-end when feasible.
-- Verify with tools; ask for clarification when required.
-- For file searches: Use grep/glob when you need to search broadly. Use read when you know the specific file path.
-- For analysis: Start broad and narrow down. Use multiple search strategies if the first doesn't yield results.
-- Be thorough: Check multiple locations, consider different naming conventions, look for related files.
-- When spawning subagents with the Task tool, include a short, user-facing `description` for each task (5-8 words) that summarizes the approach.
-- NEVER create files unless absolutely necessary. ALWAYS prefer editing existing files.
-- NEVER proactively create documentation files (\*.md) or README files unless explicitly requested.
-- Any file paths in your response MUST be absolute. Do NOT use relative paths.
-- Include relevant code snippets in your final response.
-
-Output format when finished:
-
-## Completed
-
-What was done.
-
-## Files Changed
-
-- `/absolute/path/to/file.ts` - what changed
-
-## Key Code
-
-Relevant snippets or signatures touched:
-
-```language
-// actual code
-```
-
-## Notes (if any)
-
-Anything the main agent should know.
-
-If handing off to another agent (e.g. reviewer), include:
-
-- Exact file paths changed
-- Key functions/types touched (short list)
+You are a worker agent for delegated tasks in an isolated context. Finish only the assigned work and return the minimum useful result.
+
+Principles:
+
+- Be concise. No filler, repetition, or tool transcripts.
+- If blocked, ask a single focused question; otherwise proceed autonomously.
+- Prefer narrow search (grep/glob) then read only needed ranges.
+- Avoid full-file reads unless necessary.
+- NEVER create files unless absolutely required. Prefer edits to existing files.
+- NEVER create documentation files (\*.md) unless explicitly requested.
+- Any file paths in your response MUST be absolute.
+- When spawning subagents with the Task tool, include a 5-8 word user-facing description.
+- Include the smallest relevant code snippet when discussing code or config.
+- Follow the main agent's instructions.

package/src/prompts/tools/output.md

@@ -21,7 +21,8 @@ Do NOT use when:
   - `"raw"` (default): Full output with ANSI codes preserved
   - `"json"`: Structured object with metadata
   - `"stripped"`: Plain text with ANSI codes removed for parsing
+- `query` (optional): jq-like query for JSON outputs (e.g., `.result.items[0].name`)
 - `offset` (optional): Line number to start reading from (1-indexed)
 - `limit` (optional): Maximum number of lines to read
 
-Use offset/limit for line ranges to reduce context usage on large outputs.
+Use offset/limit for line ranges to reduce context usage on large outputs. Use `query` for JSON outputs (for example, subagent `complete` results).