Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion apps/mobile/src/features/threads/ThreadComposer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import type {
ProviderInteractionMode,
RuntimeMode,
ServerConfig as HelmCodeServerConfig,
ServerProviderSkill,
} from "@helmcode/contracts";
import {
detectComposerTrigger,
Expand DownExpand Up@@ -79,6 +80,20 @@ import { useThreadSettingsSheetPresentation } from "./use-thread-settings-sheet-
*/
export const COMPOSER_COLLAPSED_CHROME = 60;

function dedupeProviderSkillsByName(
skills: ReadonlyArray<ServerProviderSkill>,
): ServerProviderSkill[] {
const seenNames = new Set<string>();
return skills.filter((skill) => {
const normalizedName = skill.name.trim().toLowerCase();
if (seenNames.has(normalizedName)) {
return false;
}
seenNames.add(normalizedName);
return true;
});
}

/**
* Height of the expanded composer (card + toolbar + vertical padding, excluding safe-area inset).
* Used by the parent to compute the larger feed bottom inset when the composer is focused.
Expand DownExpand Up@@ -431,7 +446,9 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
}

if (composerTrigger.kind === "skill") {
const enabledSkills = (selectedProviderStatus?.skills ?? []).filter((s) => s.enabled);
const enabledSkills = dedupeProviderSkillsByName(
(selectedProviderStatus?.skills ?? []).filter((s) => s.enabled),
);
const normalizedQuery = normalizeSearchQuery(composerTrigger.query, {
trimLeadingPattern: /^\$+/,
});
Expand Down
114 changes: 114 additions & 0 deletions apps/server/src/orchestration/ActivityPayloadProjection.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,120 @@ describe("projectActivityPayload agent-field survival", () => {
expect(data.somethingClientNeverReads).toBeUndefined();
});

it("keeps a bounded Codex command output summary", () => {
const projected = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
item: {
command: "/bin/zsh -lc 'printf hello'",
aggregatedOutput: `hello from codex\n${"x".repeat(5000)}`,
},
},
}),
);
const data = (projected.payload as Record<string, unknown>).data as Record<string, unknown>;
expect(data.item).toEqual({
command: "/bin/zsh -lc 'printf hello'",
aggregatedOutput: "hello from codex",
});
expect(JSON.stringify(projected.payload).length).toBeLessThan(500);
});

it("keeps preview normalization and fence-only fallback while scanning lines", () => {
const preview = projectActivityPayload(
activity({
itemType: "command_execution",
data: { rawOutput: `\`\`\`\n actual\tresult \n${"x".repeat(5000)}` },
}),
);
const fences = projectActivityPayload(
activity({
itemType: "command_execution",
data: { rawOutput: "```\r\n \t \n```\n" },
}),
);

expect((preview.payload as { data: { rawOutput: unknown } }).data.rawOutput).toEqual({
content: "actual result",
});
expect((fences.payload as { data: { rawOutput: unknown } }).data.rawOutput).toEqual({
content: "2 lines",
});
});

it("keeps bounded Claude and ACP command output summaries", () => {
const claude = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
command: "printf hello",
rawOutput: { stdout: `hello from claude\n${"y".repeat(5000)}` },
},
}),
);
const acp = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
command: "printf hello",
content: [
{
type: "content",
content: { type: "text", text: `hello from acp\n${"z".repeat(5000)}` },
},
],
},
}),
);

const claudeData = (claude.payload as Record<string, unknown>).data as Record<string, unknown>;
const acpData = (acp.payload as Record<string, unknown>).data as Record<string, unknown>;
expect(claudeData.rawOutput).toEqual({ content: "hello from claude" });
expect(acpData.rawOutput).toEqual({ content: "hello from acp" });
expect(JSON.stringify(claude.payload).length).toBeLessThan(500);
expect(JSON.stringify(acp.payload).length).toBeLessThan(500);
});

it("normalizes Claude and OpenCode command inputs before slimming provider data", () => {
const claude = projectActivityPayload(
activity({
itemType: "command_execution",
toolCallId: "claude-call-1",
data: {
toolName: "Bash",
input: { command: "vp test run" },
result: { content: "x".repeat(5_000) },
},
}),
);
const openCode = projectActivityPayload(
activity({
itemType: "command_execution",
toolCallId: "opencode-call-1",
data: {
tool: "bash",
state: {
status: "running",
input: { command: "vp lint" },
output: "x".repeat(5_000),
},
},
}),
);

expect(claude.payload).toMatchObject({
toolCallId: "claude-call-1",
data: { command: "vp test run" },
});
expect(openCode.payload).toMatchObject({
toolCallId: "opencode-call-1",
data: { command: "vp lint" },
});
expect(JSON.stringify(claude.payload).length).toBeLessThan(200);
expect(JSON.stringify(openCode.payload).length).toBeLessThan(200);
});

it("slims Codex-shaped mcp_tool_call items to rendered fields plus a result summary", () => {
const projected = projectActivityPayload(
activity({
Expand Down
129 changes: 105 additions & 24 deletions apps/server/src/orchestration/ActivityPayloadProjection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,36 +91,82 @@ function projectCommandData(data: Record<string, unknown>): Record<string, unkno
projectedItem.command = item.command;
}

const aggregatedOutput = asTrimmedString(item.aggregatedOutput);
if (aggregatedOutput) {
const summary = summarizeToolTextOutput(aggregatedOutput);
if (summary) {
projectedItem.aggregatedOutput = summary;
}
}

const input = asRecord(item.input);
if (input && "command" in input) {
projectedItem.input = { command: input.command };
}

const result = asRecord(item.result);
if (result && "command" in result) {
projectedItem.result = { command: result.command };
if (result) {
const projectedResult: Record<string, unknown> = {};
if ("command" in result) {
projectedResult.command = result.command;
}
const content = asTrimmedString(result.content);
if (content) {
const summary = summarizeToolTextOutput(content);
if (summary) {
projectedResult.content = summary;
}
}
if (Object.keys(projectedResult).length > 0) {
projectedItem.result = projectedResult;
}
}

return Object.keys(projectedItem).length > 0 ? projectedItem : undefined;
}

function projectCommandValue(data: Record<string, unknown>): unknown {
if (data.command !== undefined) {
return data.command;
}

const input = asRecord(data.input);
if (input?.command !== undefined) {
return input.command;
}

const stateInput = asRecord(asRecord(data.state)?.input);
if (stateInput?.command !== undefined) {
return stateInput.command;
}

return undefined;
}

function summarizeToolTextOutput(value: string): string | null {
const lines: string[] = [];
for (const rawLine of value.split(/\r?\n/u)) {
const line = rawLine.replace(/\s+/g, " ").trim();
let meaningfulLineCount = 0;
let offset = 0;

while (offset <= value.length) {
const newlineIndex = value.indexOf("\n", offset);
const lineEnd = newlineIndex === -1 ? value.length : newlineIndex;
const line = value.slice(offset, lineEnd).replace(/\s+/g, " ").trim();
if (line.length > 0) {
lines.push(line);
meaningfulLineCount += 1;
if (line !== "```") {
const summary = line.length <= 84 ? line : `${line.slice(0, 83).trimEnd()}…`;
// V8 can retain the full tool output behind a short sliced string.
// Join a tiny character array so the returned preview owns its bytes.
return Array.from(summary).join("");
}
}
if (newlineIndex === -1) {
break;
}
offset = newlineIndex + 1;
}

const firstLine = lines.find((line) => line !== "```");
if (firstLine) {
return firstLine.length <= 84 ? firstLine : `${firstLine.slice(0, 83).trimEnd()}…`;
}
if (lines.length > 1) {
return `${lines.length.toLocaleString()} lines`;
}
return null;
return meaningfulLineCount > 1 ? `${meaningfulLineCount.toLocaleString()} lines` : null;
}

/**
Expand DownExpand Up@@ -232,6 +278,12 @@ function projectMcpToolCallData(data: Record<string, unknown>): Record<string, u
}

function projectRawOutput(value: unknown): Record<string, unknown> | undefined {
const direct = asTrimmedString(value);
if (direct) {
const summary = summarizeToolTextOutput(direct);
return summary ? { content: summary } : undefined;
}

const rawOutput = asRecord(value);
if (!rawOutput) {
return undefined;
Expand All@@ -256,9 +308,34 @@ function projectRawOutput(value: unknown): Record<string, unknown> | undefined {
return summary ? { content: summary } : undefined;
}

const stderr = asTrimmedString(rawOutput.stderr);
if (stderr) {
const summary = summarizeToolTextOutput(stderr);
return summary ? { content: summary } : undefined;
}

return undefined;
}

function projectAcpContent(value: unknown): Record<string, unknown> | undefined {
if (!Array.isArray(value)) {
return undefined;
}

const text = value
.map((entryValue) => {
const entry = asRecord(entryValue);
const content = asRecord(entry?.content);
return entry?.type === "content" && content?.type === "text"
? asTrimmedString(content.text)
: null;
})
.filter((entry): entry is string => entry !== null)
.join("\n");
const summary = summarizeToolTextOutput(text);
return summary ? { content: summary } : undefined;
}

/**
* Removes activity payload fields that no current client reads while retaining
* the full payload in persistence and the event store.
Expand All@@ -272,11 +349,17 @@ export function projectActivityPayload(
return activity;
}

const itemStatus = asRecord(data.item)?.status;
const projectedPayload =
payload.status === "completed" && (itemStatus === "failed" || itemStatus === "declined")
? { ...payload, status: itemStatus }
: payload;

if (payload.itemType === "mcp_tool_call") {
return {
...activity,
payload: {
...payload,
...projectedPayload,
data: projectMcpToolCallData(data),
},
};
Expand All@@ -287,8 +370,9 @@ export function projectActivityPayload(
if (item) {
projectedData.item = item;
}
if ("command" in data) {
projectedData.command = data.command;
const command = projectCommandValue(data);
if (command !== undefined) {
projectedData.command = command;
}

const changedFiles: string[] = [];
Expand All@@ -305,15 +389,15 @@ export function projectActivityPayload(
projectedData.kind = data.kind;
}

const rawOutput = projectRawOutput(data.rawOutput);
const rawOutput = projectRawOutput(data.rawOutput) ?? projectAcpContent(data.content);
if (rawOutput) {
projectedData.rawOutput = rawOutput;
}

return {
...activity,
payload: {
...payload,
...projectedPayload,
data: projectedData,
},
};
Expand DownExpand Up@@ -412,9 +496,6 @@ function toolLifecycleIdentity(activity: OrchestrationThreadActivity): string |
* update within the turn — a later update belongs to a subsequent call that
* reuses the same identity and is still in flight. Rows without a lifecycle
* identity pass through, matching the clients, which never collapse them.
* Live `thread.activity-appended` events are untouched: updates still stream
* in real time and the completion supersedes them on the client as before.
*
* Deliberate divergence from client collapse: clients fold only *adjacent*
* lifecycle rows, so a superseded update separated from its completion by an
* interleaved parallel call renders as its own row today, and this drop
Expand All@@ -441,7 +522,7 @@ function dropSupersededToolUpdatedActivities(
if (!identity) {
continue;
}
const key = `${activity.turnId ?? ""}${identity}`;
const key = `${activity.turnId ?? ""}\u0000${identity}`;
const indices = completionIndicesByKey.get(key);
if (indices) {
indices.push(index);
Expand All@@ -461,7 +542,7 @@ function dropSupersededToolUpdatedActivities(
if (!identity) {
return true;
}
const indices = completionIndicesByKey.get(`${activity.turnId ?? ""}${identity}`);
const indices = completionIndicesByKey.get(`${activity.turnId ?? ""}\u0000${identity}`);
return !indices?.some((completionIndex) => completionIndex > index);
});
}
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/orchestration/Layers/CheckpointReactor.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ const make = Effect.gen(function* () {

const resolveThreadDetail = Effect.fn("resolveThreadDetail")(function* (threadId: ThreadId) {
return yield* projectionSnapshotQuery
.getThreadDetailById(threadId)
.getThreadDetailById(threadId, { activityKinds: [] })
.pipe(Effect.map(Option.getOrUndefined));
});

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion apps/mobile/src/features/threads/ThreadComposer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import type {
ProviderInteractionMode,
RuntimeMode,
ServerConfig as HelmCodeServerConfig,
ServerProviderSkill,
} from "@helmcode/contracts";
import {
detectComposerTrigger,
Expand DownExpand Up@@ -79,6 +80,20 @@ import { useThreadSettingsSheetPresentation } from "./use-thread-settings-sheet-
*/
export const COMPOSER_COLLAPSED_CHROME = 60;

function dedupeProviderSkillsByName(
skills: ReadonlyArray<ServerProviderSkill>,
): ServerProviderSkill[] {
const seenNames = new Set<string>();
return skills.filter((skill) => {
const normalizedName = skill.name.trim().toLowerCase();
if (seenNames.has(normalizedName)) {
return false;
}
seenNames.add(normalizedName);
return true;
});
}

/**
* Height of the expanded composer (card + toolbar + vertical padding, excluding safe-area inset).
* Used by the parent to compute the larger feed bottom inset when the composer is focused.
Expand DownExpand Up@@ -431,7 +446,9 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
}

if (composerTrigger.kind === "skill") {
const enabledSkills = (selectedProviderStatus?.skills ?? []).filter((s) => s.enabled);
const enabledSkills = dedupeProviderSkillsByName(
(selectedProviderStatus?.skills ?? []).filter((s) => s.enabled),
);
const normalizedQuery = normalizeSearchQuery(composerTrigger.query, {
trimLeadingPattern: /^\$+/,
});
Expand Down
114 changes: 114 additions & 0 deletions apps/server/src/orchestration/ActivityPayloadProjection.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,120 @@ describe("projectActivityPayload agent-field survival", () => {
expect(data.somethingClientNeverReads).toBeUndefined();
});

it("keeps a bounded Codex command output summary", () => {
const projected = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
item: {
command: "/bin/zsh -lc 'printf hello'",
aggregatedOutput: `hello from codex\n${"x".repeat(5000)}`,
},
},
}),
);
const data = (projected.payload as Record<string, unknown>).data as Record<string, unknown>;
expect(data.item).toEqual({
command: "/bin/zsh -lc 'printf hello'",
aggregatedOutput: "hello from codex",
});
expect(JSON.stringify(projected.payload).length).toBeLessThan(500);
});

it("keeps preview normalization and fence-only fallback while scanning lines", () => {
const preview = projectActivityPayload(
activity({
itemType: "command_execution",
data: { rawOutput: `\`\`\`\n actual\tresult \n${"x".repeat(5000)}` },
}),
);
const fences = projectActivityPayload(
activity({
itemType: "command_execution",
data: { rawOutput: "```\r\n \t \n```\n" },
}),
);

expect((preview.payload as { data: { rawOutput: unknown } }).data.rawOutput).toEqual({
content: "actual result",
});
expect((fences.payload as { data: { rawOutput: unknown } }).data.rawOutput).toEqual({
content: "2 lines",
});
});

it("keeps bounded Claude and ACP command output summaries", () => {
const claude = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
command: "printf hello",
rawOutput: { stdout: `hello from claude\n${"y".repeat(5000)}` },
},
}),
);
const acp = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
command: "printf hello",
content: [
{
type: "content",
content: { type: "text", text: `hello from acp\n${"z".repeat(5000)}` },
},
],
},
}),
);

const claudeData = (claude.payload as Record<string, unknown>).data as Record<string, unknown>;
const acpData = (acp.payload as Record<string, unknown>).data as Record<string, unknown>;
expect(claudeData.rawOutput).toEqual({ content: "hello from claude" });
expect(acpData.rawOutput).toEqual({ content: "hello from acp" });
expect(JSON.stringify(claude.payload).length).toBeLessThan(500);
expect(JSON.stringify(acp.payload).length).toBeLessThan(500);
});

it("normalizes Claude and OpenCode command inputs before slimming provider data", () => {
const claude = projectActivityPayload(
activity({
itemType: "command_execution",
toolCallId: "claude-call-1",
data: {
toolName: "Bash",
input: { command: "vp test run" },
result: { content: "x".repeat(5_000) },
},
}),
);
const openCode = projectActivityPayload(
activity({
itemType: "command_execution",
toolCallId: "opencode-call-1",
data: {
tool: "bash",
state: {
status: "running",
input: { command: "vp lint" },
output: "x".repeat(5_000),
},
},
}),
);

expect(claude.payload).toMatchObject({
toolCallId: "claude-call-1",
data: { command: "vp test run" },
});
expect(openCode.payload).toMatchObject({
toolCallId: "opencode-call-1",
data: { command: "vp lint" },
});
expect(JSON.stringify(claude.payload).length).toBeLessThan(200);
expect(JSON.stringify(openCode.payload).length).toBeLessThan(200);
});

it("slims Codex-shaped mcp_tool_call items to rendered fields plus a result summary", () => {
const projected = projectActivityPayload(
activity({
Expand Down
129 changes: 105 additions & 24 deletions apps/server/src/orchestration/ActivityPayloadProjection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,36 +91,82 @@ function projectCommandData(data: Record<string, unknown>): Record<string, unkno
projectedItem.command = item.command;
}

const aggregatedOutput = asTrimmedString(item.aggregatedOutput);
if (aggregatedOutput) {
const summary = summarizeToolTextOutput(aggregatedOutput);
if (summary) {
projectedItem.aggregatedOutput = summary;
}
}

const input = asRecord(item.input);
if (input && "command" in input) {
projectedItem.input = { command: input.command };
}

const result = asRecord(item.result);
if (result && "command" in result) {
projectedItem.result = { command: result.command };
if (result) {
const projectedResult: Record<string, unknown> = {};
if ("command" in result) {
projectedResult.command = result.command;
}
const content = asTrimmedString(result.content);
if (content) {
const summary = summarizeToolTextOutput(content);
if (summary) {
projectedResult.content = summary;
}
}
if (Object.keys(projectedResult).length > 0) {
projectedItem.result = projectedResult;
}
}

return Object.keys(projectedItem).length > 0 ? projectedItem : undefined;
}

function projectCommandValue(data: Record<string, unknown>): unknown {
if (data.command !== undefined) {
return data.command;
}

const input = asRecord(data.input);
if (input?.command !== undefined) {
return input.command;
}

const stateInput = asRecord(asRecord(data.state)?.input);
if (stateInput?.command !== undefined) {
return stateInput.command;
}

return undefined;
}

function summarizeToolTextOutput(value: string): string | null {
const lines: string[] = [];
for (const rawLine of value.split(/\r?\n/u)) {
const line = rawLine.replace(/\s+/g, " ").trim();
let meaningfulLineCount = 0;
let offset = 0;

while (offset <= value.length) {
const newlineIndex = value.indexOf("\n", offset);
const lineEnd = newlineIndex === -1 ? value.length : newlineIndex;
const line = value.slice(offset, lineEnd).replace(/\s+/g, " ").trim();
if (line.length > 0) {
lines.push(line);
meaningfulLineCount += 1;
if (line !== "```") {
const summary = line.length <= 84 ? line : `${line.slice(0, 83).trimEnd()}…`;
// V8 can retain the full tool output behind a short sliced string.
// Join a tiny character array so the returned preview owns its bytes.
return Array.from(summary).join("");
}
}
if (newlineIndex === -1) {
break;
}
offset = newlineIndex + 1;
}

const firstLine = lines.find((line) => line !== "```");
if (firstLine) {
return firstLine.length <= 84 ? firstLine : `${firstLine.slice(0, 83).trimEnd()}…`;
}
if (lines.length > 1) {
return `${lines.length.toLocaleString()} lines`;
}
return null;
return meaningfulLineCount > 1 ? `${meaningfulLineCount.toLocaleString()} lines` : null;
}

/**
Expand DownExpand Up@@ -232,6 +278,12 @@ function projectMcpToolCallData(data: Record<string, unknown>): Record<string, u
}

function projectRawOutput(value: unknown): Record<string, unknown> | undefined {
const direct = asTrimmedString(value);
if (direct) {
const summary = summarizeToolTextOutput(direct);
return summary ? { content: summary } : undefined;
}

const rawOutput = asRecord(value);
if (!rawOutput) {
return undefined;
Expand All@@ -256,9 +308,34 @@ function projectRawOutput(value: unknown): Record<string, unknown> | undefined {
return summary ? { content: summary } : undefined;
}

const stderr = asTrimmedString(rawOutput.stderr);
if (stderr) {
const summary = summarizeToolTextOutput(stderr);
return summary ? { content: summary } : undefined;
}

return undefined;
}

function projectAcpContent(value: unknown): Record<string, unknown> | undefined {
if (!Array.isArray(value)) {
return undefined;
}

const text = value
.map((entryValue) => {
const entry = asRecord(entryValue);
const content = asRecord(entry?.content);
return entry?.type === "content" && content?.type === "text"
? asTrimmedString(content.text)
: null;
})
.filter((entry): entry is string => entry !== null)
.join("\n");
const summary = summarizeToolTextOutput(text);
return summary ? { content: summary } : undefined;
}

/**
* Removes activity payload fields that no current client reads while retaining
* the full payload in persistence and the event store.
Expand All@@ -272,11 +349,17 @@ export function projectActivityPayload(
return activity;
}

const itemStatus = asRecord(data.item)?.status;
const projectedPayload =
payload.status === "completed" && (itemStatus === "failed" || itemStatus === "declined")
? { ...payload, status: itemStatus }
: payload;

if (payload.itemType === "mcp_tool_call") {
return {
...activity,
payload: {
...payload,
...projectedPayload,
data: projectMcpToolCallData(data),
},
};
Expand All@@ -287,8 +370,9 @@ export function projectActivityPayload(
if (item) {
projectedData.item = item;
}
if ("command" in data) {
projectedData.command = data.command;
const command = projectCommandValue(data);
if (command !== undefined) {
projectedData.command = command;
}

const changedFiles: string[] = [];
Expand All@@ -305,15 +389,15 @@ export function projectActivityPayload(
projectedData.kind = data.kind;
}

const rawOutput = projectRawOutput(data.rawOutput);
const rawOutput = projectRawOutput(data.rawOutput) ?? projectAcpContent(data.content);
if (rawOutput) {
projectedData.rawOutput = rawOutput;
}

return {
...activity,
payload: {
...payload,
...projectedPayload,
data: projectedData,
},
};
Expand DownExpand Up@@ -412,9 +496,6 @@ function toolLifecycleIdentity(activity: OrchestrationThreadActivity): string |
* update within the turn — a later update belongs to a subsequent call that
* reuses the same identity and is still in flight. Rows without a lifecycle
* identity pass through, matching the clients, which never collapse them.
* Live `thread.activity-appended` events are untouched: updates still stream
* in real time and the completion supersedes them on the client as before.
*
* Deliberate divergence from client collapse: clients fold only *adjacent*
* lifecycle rows, so a superseded update separated from its completion by an
* interleaved parallel call renders as its own row today, and this drop
Expand All@@ -441,7 +522,7 @@ function dropSupersededToolUpdatedActivities(
if (!identity) {
continue;
}
const key = `${activity.turnId ?? ""}${identity}`;
const key = `${activity.turnId ?? ""}\u0000${identity}`;
const indices = completionIndicesByKey.get(key);
if (indices) {
indices.push(index);
Expand All@@ -461,7 +542,7 @@ function dropSupersededToolUpdatedActivities(
if (!identity) {
return true;
}
const indices = completionIndicesByKey.get(`${activity.turnId ?? ""}${identity}`);
const indices = completionIndicesByKey.get(`${activity.turnId ?? ""}\u0000${identity}`);
return !indices?.some((completionIndex) => completionIndex > index);
});
}
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/orchestration/Layers/CheckpointReactor.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ const make = Effect.gen(function* () {

const resolveThreadDetail = Effect.fn("resolveThreadDetail")(function* (threadId: ThreadId) {
return yield* projectionSnapshotQuery
.getThreadDetailById(threadId)
.getThreadDetailById(threadId, { activityKinds: [] })
.pipe(Effect.map(Option.getOrUndefined));
});

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion apps/mobile/src/features/threads/ThreadComposer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import type {
ProviderInteractionMode,
RuntimeMode,
ServerConfig as HelmCodeServerConfig,
ServerProviderSkill,
} from "@helmcode/contracts";
import {
detectComposerTrigger,
Expand DownExpand Up@@ -79,6 +80,20 @@ import { useThreadSettingsSheetPresentation } from "./use-thread-settings-sheet-
*/
export const COMPOSER_COLLAPSED_CHROME = 60;

function dedupeProviderSkillsByName(
skills: ReadonlyArray<ServerProviderSkill>,
): ServerProviderSkill[] {
const seenNames = new Set<string>();
return skills.filter((skill) => {
const normalizedName = skill.name.trim().toLowerCase();
if (seenNames.has(normalizedName)) {
return false;
}
seenNames.add(normalizedName);
return true;
});
}

/**
* Height of the expanded composer (card + toolbar + vertical padding, excluding safe-area inset).
* Used by the parent to compute the larger feed bottom inset when the composer is focused.
Expand DownExpand Up@@ -431,7 +446,9 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
}

if (composerTrigger.kind === "skill") {
const enabledSkills = (selectedProviderStatus?.skills ?? []).filter((s) => s.enabled);
const enabledSkills = dedupeProviderSkillsByName(
(selectedProviderStatus?.skills ?? []).filter((s) => s.enabled),
);
const normalizedQuery = normalizeSearchQuery(composerTrigger.query, {
trimLeadingPattern: /^\$+/,
});
Expand Down
114 changes: 114 additions & 0 deletions apps/server/src/orchestration/ActivityPayloadProjection.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,120 @@ describe("projectActivityPayload agent-field survival", () => {
expect(data.somethingClientNeverReads).toBeUndefined();
});

it("keeps a bounded Codex command output summary", () => {
const projected = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
item: {
command: "/bin/zsh -lc 'printf hello'",
aggregatedOutput: `hello from codex\n${"x".repeat(5000)}`,
},
},
}),
);
const data = (projected.payload as Record<string, unknown>).data as Record<string, unknown>;
expect(data.item).toEqual({
command: "/bin/zsh -lc 'printf hello'",
aggregatedOutput: "hello from codex",
});
expect(JSON.stringify(projected.payload).length).toBeLessThan(500);
});

it("keeps preview normalization and fence-only fallback while scanning lines", () => {
const preview = projectActivityPayload(
activity({
itemType: "command_execution",
data: { rawOutput: `\`\`\`\n actual\tresult \n${"x".repeat(5000)}` },
}),
);
const fences = projectActivityPayload(
activity({
itemType: "command_execution",
data: { rawOutput: "```\r\n \t \n```\n" },
}),
);

expect((preview.payload as { data: { rawOutput: unknown } }).data.rawOutput).toEqual({
content: "actual result",
});
expect((fences.payload as { data: { rawOutput: unknown } }).data.rawOutput).toEqual({
content: "2 lines",
});
});

it("keeps bounded Claude and ACP command output summaries", () => {
const claude = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
command: "printf hello",
rawOutput: { stdout: `hello from claude\n${"y".repeat(5000)}` },
},
}),
);
const acp = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
command: "printf hello",
content: [
{
type: "content",
content: { type: "text", text: `hello from acp\n${"z".repeat(5000)}` },
},
],
},
}),
);

const claudeData = (claude.payload as Record<string, unknown>).data as Record<string, unknown>;
const acpData = (acp.payload as Record<string, unknown>).data as Record<string, unknown>;
expect(claudeData.rawOutput).toEqual({ content: "hello from claude" });
expect(acpData.rawOutput).toEqual({ content: "hello from acp" });
expect(JSON.stringify(claude.payload).length).toBeLessThan(500);
expect(JSON.stringify(acp.payload).length).toBeLessThan(500);
});

it("normalizes Claude and OpenCode command inputs before slimming provider data", () => {
const claude = projectActivityPayload(
activity({
itemType: "command_execution",
toolCallId: "claude-call-1",
data: {
toolName: "Bash",
input: { command: "vp test run" },
result: { content: "x".repeat(5_000) },
},
}),
);
const openCode = projectActivityPayload(
activity({
itemType: "command_execution",
toolCallId: "opencode-call-1",
data: {
tool: "bash",
state: {
status: "running",
input: { command: "vp lint" },
output: "x".repeat(5_000),
},
},
}),
);

expect(claude.payload).toMatchObject({
toolCallId: "claude-call-1",
data: { command: "vp test run" },
});
expect(openCode.payload).toMatchObject({
toolCallId: "opencode-call-1",
data: { command: "vp lint" },
});
expect(JSON.stringify(claude.payload).length).toBeLessThan(200);
expect(JSON.stringify(openCode.payload).length).toBeLessThan(200);
});

it("slims Codex-shaped mcp_tool_call items to rendered fields plus a result summary", () => {
const projected = projectActivityPayload(
activity({
Expand Down
129 changes: 105 additions & 24 deletions apps/server/src/orchestration/ActivityPayloadProjection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,36 +91,82 @@ function projectCommandData(data: Record<string, unknown>): Record<string, unkno
projectedItem.command = item.command;
}

const aggregatedOutput = asTrimmedString(item.aggregatedOutput);
if (aggregatedOutput) {
const summary = summarizeToolTextOutput(aggregatedOutput);
if (summary) {
projectedItem.aggregatedOutput = summary;
}
}

const input = asRecord(item.input);
if (input && "command" in input) {
projectedItem.input = { command: input.command };
}

const result = asRecord(item.result);
if (result && "command" in result) {
projectedItem.result = { command: result.command };
if (result) {
const projectedResult: Record<string, unknown> = {};
if ("command" in result) {
projectedResult.command = result.command;
}
const content = asTrimmedString(result.content);
if (content) {
const summary = summarizeToolTextOutput(content);
if (summary) {
projectedResult.content = summary;
}
}
if (Object.keys(projectedResult).length > 0) {
projectedItem.result = projectedResult;
}
}

return Object.keys(projectedItem).length > 0 ? projectedItem : undefined;
}

function projectCommandValue(data: Record<string, unknown>): unknown {
if (data.command !== undefined) {
return data.command;
}

const input = asRecord(data.input);
if (input?.command !== undefined) {
return input.command;
}

const stateInput = asRecord(asRecord(data.state)?.input);
if (stateInput?.command !== undefined) {
return stateInput.command;
}

return undefined;
}

function summarizeToolTextOutput(value: string): string | null {
const lines: string[] = [];
for (const rawLine of value.split(/\r?\n/u)) {
const line = rawLine.replace(/\s+/g, " ").trim();
let meaningfulLineCount = 0;
let offset = 0;

while (offset <= value.length) {
const newlineIndex = value.indexOf("\n", offset);
const lineEnd = newlineIndex === -1 ? value.length : newlineIndex;
const line = value.slice(offset, lineEnd).replace(/\s+/g, " ").trim();
if (line.length > 0) {
lines.push(line);
meaningfulLineCount += 1;
if (line !== "```") {
const summary = line.length <= 84 ? line : `${line.slice(0, 83).trimEnd()}…`;
// V8 can retain the full tool output behind a short sliced string.
// Join a tiny character array so the returned preview owns its bytes.
return Array.from(summary).join("");
}
}
if (newlineIndex === -1) {
break;
}
offset = newlineIndex + 1;
}

const firstLine = lines.find((line) => line !== "```");
if (firstLine) {
return firstLine.length <= 84 ? firstLine : `${firstLine.slice(0, 83).trimEnd()}…`;
}
if (lines.length > 1) {
return `${lines.length.toLocaleString()} lines`;
}
return null;
return meaningfulLineCount > 1 ? `${meaningfulLineCount.toLocaleString()} lines` : null;
}

/**
Expand DownExpand Up@@ -232,6 +278,12 @@ function projectMcpToolCallData(data: Record<string, unknown>): Record<string, u
}

function projectRawOutput(value: unknown): Record<string, unknown> | undefined {
const direct = asTrimmedString(value);
if (direct) {
const summary = summarizeToolTextOutput(direct);
return summary ? { content: summary } : undefined;
}

const rawOutput = asRecord(value);
if (!rawOutput) {
return undefined;
Expand All@@ -256,9 +308,34 @@ function projectRawOutput(value: unknown): Record<string, unknown> | undefined {
return summary ? { content: summary } : undefined;
}

const stderr = asTrimmedString(rawOutput.stderr);
if (stderr) {
const summary = summarizeToolTextOutput(stderr);
return summary ? { content: summary } : undefined;
}

return undefined;
}

function projectAcpContent(value: unknown): Record<string, unknown> | undefined {
if (!Array.isArray(value)) {
return undefined;
}

const text = value
.map((entryValue) => {
const entry = asRecord(entryValue);
const content = asRecord(entry?.content);
return entry?.type === "content" && content?.type === "text"
? asTrimmedString(content.text)
: null;
})
.filter((entry): entry is string => entry !== null)
.join("\n");
const summary = summarizeToolTextOutput(text);
return summary ? { content: summary } : undefined;
}

/**
* Removes activity payload fields that no current client reads while retaining
* the full payload in persistence and the event store.
Expand All@@ -272,11 +349,17 @@ export function projectActivityPayload(
return activity;
}

const itemStatus = asRecord(data.item)?.status;
const projectedPayload =
payload.status === "completed" && (itemStatus === "failed" || itemStatus === "declined")
? { ...payload, status: itemStatus }
: payload;

if (payload.itemType === "mcp_tool_call") {
return {
...activity,
payload: {
...payload,
...projectedPayload,
data: projectMcpToolCallData(data),
},
};
Expand All@@ -287,8 +370,9 @@ export function projectActivityPayload(
if (item) {
projectedData.item = item;
}
if ("command" in data) {
projectedData.command = data.command;
const command = projectCommandValue(data);
if (command !== undefined) {
projectedData.command = command;
}

const changedFiles: string[] = [];
Expand All@@ -305,15 +389,15 @@ export function projectActivityPayload(
projectedData.kind = data.kind;
}

const rawOutput = projectRawOutput(data.rawOutput);
const rawOutput = projectRawOutput(data.rawOutput) ?? projectAcpContent(data.content);
if (rawOutput) {
projectedData.rawOutput = rawOutput;
}

return {
...activity,
payload: {
...payload,
...projectedPayload,
data: projectedData,
},
};
Expand DownExpand Up@@ -412,9 +496,6 @@ function toolLifecycleIdentity(activity: OrchestrationThreadActivity): string |
* update within the turn — a later update belongs to a subsequent call that
* reuses the same identity and is still in flight. Rows without a lifecycle
* identity pass through, matching the clients, which never collapse them.
* Live `thread.activity-appended` events are untouched: updates still stream
* in real time and the completion supersedes them on the client as before.
*
* Deliberate divergence from client collapse: clients fold only *adjacent*
* lifecycle rows, so a superseded update separated from its completion by an
* interleaved parallel call renders as its own row today, and this drop
Expand All@@ -441,7 +522,7 @@ function dropSupersededToolUpdatedActivities(
if (!identity) {
continue;
}
const key = `${activity.turnId ?? ""}${identity}`;
const key = `${activity.turnId ?? ""}\u0000${identity}`;
const indices = completionIndicesByKey.get(key);
if (indices) {
indices.push(index);
Expand All@@ -461,7 +542,7 @@ function dropSupersededToolUpdatedActivities(
if (!identity) {
return true;
}
const indices = completionIndicesByKey.get(`${activity.turnId ?? ""}${identity}`);
const indices = completionIndicesByKey.get(`${activity.turnId ?? ""}\u0000${identity}`);
return !indices?.some((completionIndex) => completionIndex > index);
});
}
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/orchestration/Layers/CheckpointReactor.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ const make = Effect.gen(function* () {

const resolveThreadDetail = Effect.fn("resolveThreadDetail")(function* (threadId: ThreadId) {
return yield* projectionSnapshotQuery
.getThreadDetailById(threadId)
.getThreadDetailById(threadId, { activityKinds: [] })
.pipe(Effect.map(Option.getOrUndefined));
});

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion apps/mobile/src/features/threads/ThreadComposer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import type {
ProviderInteractionMode,
RuntimeMode,
ServerConfig as HelmCodeServerConfig,
ServerProviderSkill,
} from "@helmcode/contracts";
import {
detectComposerTrigger,
Expand DownExpand Up@@ -79,6 +80,20 @@ import { useThreadSettingsSheetPresentation } from "./use-thread-settings-sheet-
*/
export const COMPOSER_COLLAPSED_CHROME = 60;

function dedupeProviderSkillsByName(
skills: ReadonlyArray<ServerProviderSkill>,
): ServerProviderSkill[] {
const seenNames = new Set<string>();
return skills.filter((skill) => {
const normalizedName = skill.name.trim().toLowerCase();
if (seenNames.has(normalizedName)) {
return false;
}
seenNames.add(normalizedName);
return true;
});
}

/**
* Height of the expanded composer (card + toolbar + vertical padding, excluding safe-area inset).
* Used by the parent to compute the larger feed bottom inset when the composer is focused.
Expand DownExpand Up@@ -431,7 +446,9 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
}

if (composerTrigger.kind === "skill") {
const enabledSkills = (selectedProviderStatus?.skills ?? []).filter((s) => s.enabled);
const enabledSkills = dedupeProviderSkillsByName(
(selectedProviderStatus?.skills ?? []).filter((s) => s.enabled),
);
const normalizedQuery = normalizeSearchQuery(composerTrigger.query, {
trimLeadingPattern: /^\$+/,
});
Expand Down
114 changes: 114 additions & 0 deletions apps/server/src/orchestration/ActivityPayloadProjection.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,120 @@ describe("projectActivityPayload agent-field survival", () => {
expect(data.somethingClientNeverReads).toBeUndefined();
});

it("keeps a bounded Codex command output summary", () => {
const projected = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
item: {
command: "/bin/zsh -lc 'printf hello'",
aggregatedOutput: `hello from codex\n${"x".repeat(5000)}`,
},
},
}),
);
const data = (projected.payload as Record<string, unknown>).data as Record<string, unknown>;
expect(data.item).toEqual({
command: "/bin/zsh -lc 'printf hello'",
aggregatedOutput: "hello from codex",
});
expect(JSON.stringify(projected.payload).length).toBeLessThan(500);
});

it("keeps preview normalization and fence-only fallback while scanning lines", () => {
const preview = projectActivityPayload(
activity({
itemType: "command_execution",
data: { rawOutput: `\`\`\`\n actual\tresult \n${"x".repeat(5000)}` },
}),
);
const fences = projectActivityPayload(
activity({
itemType: "command_execution",
data: { rawOutput: "```\r\n \t \n```\n" },
}),
);

expect((preview.payload as { data: { rawOutput: unknown } }).data.rawOutput).toEqual({
content: "actual result",
});
expect((fences.payload as { data: { rawOutput: unknown } }).data.rawOutput).toEqual({
content: "2 lines",
});
});

it("keeps bounded Claude and ACP command output summaries", () => {
const claude = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
command: "printf hello",
rawOutput: { stdout: `hello from claude\n${"y".repeat(5000)}` },
},
}),
);
const acp = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
command: "printf hello",
content: [
{
type: "content",
content: { type: "text", text: `hello from acp\n${"z".repeat(5000)}` },
},
],
},
}),
);

const claudeData = (claude.payload as Record<string, unknown>).data as Record<string, unknown>;
const acpData = (acp.payload as Record<string, unknown>).data as Record<string, unknown>;
expect(claudeData.rawOutput).toEqual({ content: "hello from claude" });
expect(acpData.rawOutput).toEqual({ content: "hello from acp" });
expect(JSON.stringify(claude.payload).length).toBeLessThan(500);
expect(JSON.stringify(acp.payload).length).toBeLessThan(500);
});

it("normalizes Claude and OpenCode command inputs before slimming provider data", () => {
const claude = projectActivityPayload(
activity({
itemType: "command_execution",
toolCallId: "claude-call-1",
data: {
toolName: "Bash",
input: { command: "vp test run" },
result: { content: "x".repeat(5_000) },
},
}),
);
const openCode = projectActivityPayload(
activity({
itemType: "command_execution",
toolCallId: "opencode-call-1",
data: {
tool: "bash",
state: {
status: "running",
input: { command: "vp lint" },
output: "x".repeat(5_000),
},
},
}),
);

expect(claude.payload).toMatchObject({
toolCallId: "claude-call-1",
data: { command: "vp test run" },
});
expect(openCode.payload).toMatchObject({
toolCallId: "opencode-call-1",
data: { command: "vp lint" },
});
expect(JSON.stringify(claude.payload).length).toBeLessThan(200);
expect(JSON.stringify(openCode.payload).length).toBeLessThan(200);
});

it("slims Codex-shaped mcp_tool_call items to rendered fields plus a result summary", () => {
const projected = projectActivityPayload(
activity({
Expand Down
129 changes: 105 additions & 24 deletions apps/server/src/orchestration/ActivityPayloadProjection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,36 +91,82 @@ function projectCommandData(data: Record<string, unknown>): Record<string, unkno
projectedItem.command = item.command;
}

const aggregatedOutput = asTrimmedString(item.aggregatedOutput);
if (aggregatedOutput) {
const summary = summarizeToolTextOutput(aggregatedOutput);
if (summary) {
projectedItem.aggregatedOutput = summary;
}
}

const input = asRecord(item.input);
if (input && "command" in input) {
projectedItem.input = { command: input.command };
}

const result = asRecord(item.result);
if (result && "command" in result) {
projectedItem.result = { command: result.command };
if (result) {
const projectedResult: Record<string, unknown> = {};
if ("command" in result) {
projectedResult.command = result.command;
}
const content = asTrimmedString(result.content);
if (content) {
const summary = summarizeToolTextOutput(content);
if (summary) {
projectedResult.content = summary;
}
}
if (Object.keys(projectedResult).length > 0) {
projectedItem.result = projectedResult;
}
}

return Object.keys(projectedItem).length > 0 ? projectedItem : undefined;
}

function projectCommandValue(data: Record<string, unknown>): unknown {
if (data.command !== undefined) {
return data.command;
}

const input = asRecord(data.input);
if (input?.command !== undefined) {
return input.command;
}

const stateInput = asRecord(asRecord(data.state)?.input);
if (stateInput?.command !== undefined) {
return stateInput.command;
}

return undefined;
}

function summarizeToolTextOutput(value: string): string | null {
const lines: string[] = [];
for (const rawLine of value.split(/\r?\n/u)) {
const line = rawLine.replace(/\s+/g, " ").trim();
let meaningfulLineCount = 0;
let offset = 0;

while (offset <= value.length) {
const newlineIndex = value.indexOf("\n", offset);
const lineEnd = newlineIndex === -1 ? value.length : newlineIndex;
const line = value.slice(offset, lineEnd).replace(/\s+/g, " ").trim();
if (line.length > 0) {
lines.push(line);
meaningfulLineCount += 1;
if (line !== "```") {
const summary = line.length <= 84 ? line : `${line.slice(0, 83).trimEnd()}…`;
// V8 can retain the full tool output behind a short sliced string.
// Join a tiny character array so the returned preview owns its bytes.
return Array.from(summary).join("");
}
}
if (newlineIndex === -1) {
break;
}
offset = newlineIndex + 1;
}

const firstLine = lines.find((line) => line !== "```");
if (firstLine) {
return firstLine.length <= 84 ? firstLine : `${firstLine.slice(0, 83).trimEnd()}…`;
}
if (lines.length > 1) {
return `${lines.length.toLocaleString()} lines`;
}
return null;
return meaningfulLineCount > 1 ? `${meaningfulLineCount.toLocaleString()} lines` : null;
}

/**
Expand DownExpand Up@@ -232,6 +278,12 @@ function projectMcpToolCallData(data: Record<string, unknown>): Record<string, u
}

function projectRawOutput(value: unknown): Record<string, unknown> | undefined {
const direct = asTrimmedString(value);
if (direct) {
const summary = summarizeToolTextOutput(direct);
return summary ? { content: summary } : undefined;
}

const rawOutput = asRecord(value);
if (!rawOutput) {
return undefined;
Expand All@@ -256,9 +308,34 @@ function projectRawOutput(value: unknown): Record<string, unknown> | undefined {
return summary ? { content: summary } : undefined;
}

const stderr = asTrimmedString(rawOutput.stderr);
if (stderr) {
const summary = summarizeToolTextOutput(stderr);
return summary ? { content: summary } : undefined;
}

return undefined;
}

function projectAcpContent(value: unknown): Record<string, unknown> | undefined {
if (!Array.isArray(value)) {
return undefined;
}

const text = value
.map((entryValue) => {
const entry = asRecord(entryValue);
const content = asRecord(entry?.content);
return entry?.type === "content" && content?.type === "text"
? asTrimmedString(content.text)
: null;
})
.filter((entry): entry is string => entry !== null)
.join("\n");
const summary = summarizeToolTextOutput(text);
return summary ? { content: summary } : undefined;
}

/**
* Removes activity payload fields that no current client reads while retaining
* the full payload in persistence and the event store.
Expand All@@ -272,11 +349,17 @@ export function projectActivityPayload(
return activity;
}

const itemStatus = asRecord(data.item)?.status;
const projectedPayload =
payload.status === "completed" && (itemStatus === "failed" || itemStatus === "declined")
? { ...payload, status: itemStatus }
: payload;

if (payload.itemType === "mcp_tool_call") {
return {
...activity,
payload: {
...payload,
...projectedPayload,
data: projectMcpToolCallData(data),
},
};
Expand All@@ -287,8 +370,9 @@ export function projectActivityPayload(
if (item) {
projectedData.item = item;
}
if ("command" in data) {
projectedData.command = data.command;
const command = projectCommandValue(data);
if (command !== undefined) {
projectedData.command = command;
}

const changedFiles: string[] = [];
Expand All@@ -305,15 +389,15 @@ export function projectActivityPayload(
projectedData.kind = data.kind;
}

const rawOutput = projectRawOutput(data.rawOutput);
const rawOutput = projectRawOutput(data.rawOutput) ?? projectAcpContent(data.content);
if (rawOutput) {
projectedData.rawOutput = rawOutput;
}

return {
...activity,
payload: {
...payload,
...projectedPayload,
data: projectedData,
},
};
Expand DownExpand Up@@ -412,9 +496,6 @@ function toolLifecycleIdentity(activity: OrchestrationThreadActivity): string |
* update within the turn — a later update belongs to a subsequent call that
* reuses the same identity and is still in flight. Rows without a lifecycle
* identity pass through, matching the clients, which never collapse them.
* Live `thread.activity-appended` events are untouched: updates still stream
* in real time and the completion supersedes them on the client as before.
*
* Deliberate divergence from client collapse: clients fold only *adjacent*
* lifecycle rows, so a superseded update separated from its completion by an
* interleaved parallel call renders as its own row today, and this drop
Expand All@@ -441,7 +522,7 @@ function dropSupersededToolUpdatedActivities(
if (!identity) {
continue;
}
const key = `${activity.turnId ?? ""}${identity}`;
const key = `${activity.turnId ?? ""}\u0000${identity}`;
const indices = completionIndicesByKey.get(key);
if (indices) {
indices.push(index);
Expand All@@ -461,7 +542,7 @@ function dropSupersededToolUpdatedActivities(
if (!identity) {
return true;
}
const indices = completionIndicesByKey.get(`${activity.turnId ?? ""}${identity}`);
const indices = completionIndicesByKey.get(`${activity.turnId ?? ""}\u0000${identity}`);
return !indices?.some((completionIndex) => completionIndex > index);
});
}
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/orchestration/Layers/CheckpointReactor.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ const make = Effect.gen(function* () {

const resolveThreadDetail = Effect.fn("resolveThreadDetail")(function* (threadId: ThreadId) {
return yield* projectionSnapshotQuery
.getThreadDetailById(threadId)
.getThreadDetailById(threadId, { activityKinds: [] })
.pipe(Effect.map(Option.getOrUndefined));
});

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion apps/mobile/src/features/threads/ThreadComposer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import type {
ProviderInteractionMode,
RuntimeMode,
ServerConfig as HelmCodeServerConfig,
ServerProviderSkill,
} from "@helmcode/contracts";
import {
detectComposerTrigger,
Expand DownExpand Up@@ -79,6 +80,20 @@ import { useThreadSettingsSheetPresentation } from "./use-thread-settings-sheet-
*/
export const COMPOSER_COLLAPSED_CHROME = 60;

function dedupeProviderSkillsByName(
skills: ReadonlyArray<ServerProviderSkill>,
): ServerProviderSkill[] {
const seenNames = new Set<string>();
return skills.filter((skill) => {
const normalizedName = skill.name.trim().toLowerCase();
if (seenNames.has(normalizedName)) {
return false;
}
seenNames.add(normalizedName);
return true;
});
}

/**
* Height of the expanded composer (card + toolbar + vertical padding, excluding safe-area inset).
* Used by the parent to compute the larger feed bottom inset when the composer is focused.
Expand DownExpand Up@@ -431,7 +446,9 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
}

if (composerTrigger.kind === "skill") {
const enabledSkills = (selectedProviderStatus?.skills ?? []).filter((s) => s.enabled);
const enabledSkills = dedupeProviderSkillsByName(
(selectedProviderStatus?.skills ?? []).filter((s) => s.enabled),
);
const normalizedQuery = normalizeSearchQuery(composerTrigger.query, {
trimLeadingPattern: /^\$+/,
});
Expand Down
114 changes: 114 additions & 0 deletions apps/server/src/orchestration/ActivityPayloadProjection.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,120 @@ describe("projectActivityPayload agent-field survival", () => {
expect(data.somethingClientNeverReads).toBeUndefined();
});

it("keeps a bounded Codex command output summary", () => {
const projected = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
item: {
command: "/bin/zsh -lc 'printf hello'",
aggregatedOutput: `hello from codex\n${"x".repeat(5000)}`,
},
},
}),
);
const data = (projected.payload as Record<string, unknown>).data as Record<string, unknown>;
expect(data.item).toEqual({
command: "/bin/zsh -lc 'printf hello'",
aggregatedOutput: "hello from codex",
});
expect(JSON.stringify(projected.payload).length).toBeLessThan(500);
});

it("keeps preview normalization and fence-only fallback while scanning lines", () => {
const preview = projectActivityPayload(
activity({
itemType: "command_execution",
data: { rawOutput: `\`\`\`\n actual\tresult \n${"x".repeat(5000)}` },
}),
);
const fences = projectActivityPayload(
activity({
itemType: "command_execution",
data: { rawOutput: "```\r\n \t \n```\n" },
}),
);

expect((preview.payload as { data: { rawOutput: unknown } }).data.rawOutput).toEqual({
content: "actual result",
});
expect((fences.payload as { data: { rawOutput: unknown } }).data.rawOutput).toEqual({
content: "2 lines",
});
});

it("keeps bounded Claude and ACP command output summaries", () => {
const claude = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
command: "printf hello",
rawOutput: { stdout: `hello from claude\n${"y".repeat(5000)}` },
},
}),
);
const acp = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
command: "printf hello",
content: [
{
type: "content",
content: { type: "text", text: `hello from acp\n${"z".repeat(5000)}` },
},
],
},
}),
);

const claudeData = (claude.payload as Record<string, unknown>).data as Record<string, unknown>;
const acpData = (acp.payload as Record<string, unknown>).data as Record<string, unknown>;
expect(claudeData.rawOutput).toEqual({ content: "hello from claude" });
expect(acpData.rawOutput).toEqual({ content: "hello from acp" });
expect(JSON.stringify(claude.payload).length).toBeLessThan(500);
expect(JSON.stringify(acp.payload).length).toBeLessThan(500);
});

it("normalizes Claude and OpenCode command inputs before slimming provider data", () => {
const claude = projectActivityPayload(
activity({
itemType: "command_execution",
toolCallId: "claude-call-1",
data: {
toolName: "Bash",
input: { command: "vp test run" },
result: { content: "x".repeat(5_000) },
},
}),
);
const openCode = projectActivityPayload(
activity({
itemType: "command_execution",
toolCallId: "opencode-call-1",
data: {
tool: "bash",
state: {
status: "running",
input: { command: "vp lint" },
output: "x".repeat(5_000),
},
},
}),
);

expect(claude.payload).toMatchObject({
toolCallId: "claude-call-1",
data: { command: "vp test run" },
});
expect(openCode.payload).toMatchObject({
toolCallId: "opencode-call-1",
data: { command: "vp lint" },
});
expect(JSON.stringify(claude.payload).length).toBeLessThan(200);
expect(JSON.stringify(openCode.payload).length).toBeLessThan(200);
});

it("slims Codex-shaped mcp_tool_call items to rendered fields plus a result summary", () => {
const projected = projectActivityPayload(
activity({
Expand Down
129 changes: 105 additions & 24 deletions apps/server/src/orchestration/ActivityPayloadProjection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,36 +91,82 @@ function projectCommandData(data: Record<string, unknown>): Record<string, unkno
projectedItem.command = item.command;
}

const aggregatedOutput = asTrimmedString(item.aggregatedOutput);
if (aggregatedOutput) {
const summary = summarizeToolTextOutput(aggregatedOutput);
if (summary) {
projectedItem.aggregatedOutput = summary;
}
}

const input = asRecord(item.input);
if (input && "command" in input) {
projectedItem.input = { command: input.command };
}

const result = asRecord(item.result);
if (result && "command" in result) {
projectedItem.result = { command: result.command };
if (result) {
const projectedResult: Record<string, unknown> = {};
if ("command" in result) {
projectedResult.command = result.command;
}
const content = asTrimmedString(result.content);
if (content) {
const summary = summarizeToolTextOutput(content);
if (summary) {
projectedResult.content = summary;
}
}
if (Object.keys(projectedResult).length > 0) {
projectedItem.result = projectedResult;
}
}

return Object.keys(projectedItem).length > 0 ? projectedItem : undefined;
}

function projectCommandValue(data: Record<string, unknown>): unknown {
if (data.command !== undefined) {
return data.command;
}

const input = asRecord(data.input);
if (input?.command !== undefined) {
return input.command;
}

const stateInput = asRecord(asRecord(data.state)?.input);
if (stateInput?.command !== undefined) {
return stateInput.command;
}

return undefined;
}

function summarizeToolTextOutput(value: string): string | null {
const lines: string[] = [];
for (const rawLine of value.split(/\r?\n/u)) {
const line = rawLine.replace(/\s+/g, " ").trim();
let meaningfulLineCount = 0;
let offset = 0;

while (offset <= value.length) {
const newlineIndex = value.indexOf("\n", offset);
const lineEnd = newlineIndex === -1 ? value.length : newlineIndex;
const line = value.slice(offset, lineEnd).replace(/\s+/g, " ").trim();
if (line.length > 0) {
lines.push(line);
meaningfulLineCount += 1;
if (line !== "```") {
const summary = line.length <= 84 ? line : `${line.slice(0, 83).trimEnd()}…`;
// V8 can retain the full tool output behind a short sliced string.
// Join a tiny character array so the returned preview owns its bytes.
return Array.from(summary).join("");
}
}
if (newlineIndex === -1) {
break;
}
offset = newlineIndex + 1;
}

const firstLine = lines.find((line) => line !== "```");
if (firstLine) {
return firstLine.length <= 84 ? firstLine : `${firstLine.slice(0, 83).trimEnd()}…`;
}
if (lines.length > 1) {
return `${lines.length.toLocaleString()} lines`;
}
return null;
return meaningfulLineCount > 1 ? `${meaningfulLineCount.toLocaleString()} lines` : null;
}

/**
Expand DownExpand Up@@ -232,6 +278,12 @@ function projectMcpToolCallData(data: Record<string, unknown>): Record<string, u
}

function projectRawOutput(value: unknown): Record<string, unknown> | undefined {
const direct = asTrimmedString(value);
if (direct) {
const summary = summarizeToolTextOutput(direct);
return summary ? { content: summary } : undefined;
}

const rawOutput = asRecord(value);
if (!rawOutput) {
return undefined;
Expand All@@ -256,9 +308,34 @@ function projectRawOutput(value: unknown): Record<string, unknown> | undefined {
return summary ? { content: summary } : undefined;
}

const stderr = asTrimmedString(rawOutput.stderr);
if (stderr) {
const summary = summarizeToolTextOutput(stderr);
return summary ? { content: summary } : undefined;
}

return undefined;
}

function projectAcpContent(value: unknown): Record<string, unknown> | undefined {
if (!Array.isArray(value)) {
return undefined;
}

const text = value
.map((entryValue) => {
const entry = asRecord(entryValue);
const content = asRecord(entry?.content);
return entry?.type === "content" && content?.type === "text"
? asTrimmedString(content.text)
: null;
})
.filter((entry): entry is string => entry !== null)
.join("\n");
const summary = summarizeToolTextOutput(text);
return summary ? { content: summary } : undefined;
}

/**
* Removes activity payload fields that no current client reads while retaining
* the full payload in persistence and the event store.
Expand All@@ -272,11 +349,17 @@ export function projectActivityPayload(
return activity;
}

const itemStatus = asRecord(data.item)?.status;
const projectedPayload =
payload.status === "completed" && (itemStatus === "failed" || itemStatus === "declined")
? { ...payload, status: itemStatus }
: payload;

if (payload.itemType === "mcp_tool_call") {
return {
...activity,
payload: {
...payload,
...projectedPayload,
data: projectMcpToolCallData(data),
},
};
Expand All@@ -287,8 +370,9 @@ export function projectActivityPayload(
if (item) {
projectedData.item = item;
}
if ("command" in data) {
projectedData.command = data.command;
const command = projectCommandValue(data);
if (command !== undefined) {
projectedData.command = command;
}

const changedFiles: string[] = [];
Expand All@@ -305,15 +389,15 @@ export function projectActivityPayload(
projectedData.kind = data.kind;
}

const rawOutput = projectRawOutput(data.rawOutput);
const rawOutput = projectRawOutput(data.rawOutput) ?? projectAcpContent(data.content);
if (rawOutput) {
projectedData.rawOutput = rawOutput;
}

return {
...activity,
payload: {
...payload,
...projectedPayload,
data: projectedData,
},
};
Expand DownExpand Up@@ -412,9 +496,6 @@ function toolLifecycleIdentity(activity: OrchestrationThreadActivity): string |
* update within the turn — a later update belongs to a subsequent call that
* reuses the same identity and is still in flight. Rows without a lifecycle
* identity pass through, matching the clients, which never collapse them.
* Live `thread.activity-appended` events are untouched: updates still stream
* in real time and the completion supersedes them on the client as before.
*
* Deliberate divergence from client collapse: clients fold only *adjacent*
* lifecycle rows, so a superseded update separated from its completion by an
* interleaved parallel call renders as its own row today, and this drop
Expand All@@ -441,7 +522,7 @@ function dropSupersededToolUpdatedActivities(
if (!identity) {
continue;
}
const key = `${activity.turnId ?? ""}${identity}`;
const key = `${activity.turnId ?? ""}\u0000${identity}`;
const indices = completionIndicesByKey.get(key);
if (indices) {
indices.push(index);
Expand All@@ -461,7 +542,7 @@ function dropSupersededToolUpdatedActivities(
if (!identity) {
return true;
}
const indices = completionIndicesByKey.get(`${activity.turnId ?? ""}${identity}`);
const indices = completionIndicesByKey.get(`${activity.turnId ?? ""}\u0000${identity}`);
return !indices?.some((completionIndex) => completionIndex > index);
});
}
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/orchestration/Layers/CheckpointReactor.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ const make = Effect.gen(function* () {

const resolveThreadDetail = Effect.fn("resolveThreadDetail")(function* (threadId: ThreadId) {
return yield* projectionSnapshotQuery
.getThreadDetailById(threadId)
.getThreadDetailById(threadId, { activityKinds: [] })
.pipe(Effect.map(Option.getOrUndefined));
});

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion apps/mobile/src/features/threads/ThreadComposer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import type {
ProviderInteractionMode,
RuntimeMode,
ServerConfig as HelmCodeServerConfig,
ServerProviderSkill,
} from "@helmcode/contracts";
import {
detectComposerTrigger,
Expand DownExpand Up@@ -79,6 +80,20 @@ import { useThreadSettingsSheetPresentation } from "./use-thread-settings-sheet-
*/
export const COMPOSER_COLLAPSED_CHROME = 60;

function dedupeProviderSkillsByName(
skills: ReadonlyArray<ServerProviderSkill>,
): ServerProviderSkill[] {
const seenNames = new Set<string>();
return skills.filter((skill) => {
const normalizedName = skill.name.trim().toLowerCase();
if (seenNames.has(normalizedName)) {
return false;
}
seenNames.add(normalizedName);
return true;
});
}

/**
* Height of the expanded composer (card + toolbar + vertical padding, excluding safe-area inset).
* Used by the parent to compute the larger feed bottom inset when the composer is focused.
Expand DownExpand Up@@ -431,7 +446,9 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
}

if (composerTrigger.kind === "skill") {
const enabledSkills = (selectedProviderStatus?.skills ?? []).filter((s) => s.enabled);
const enabledSkills = dedupeProviderSkillsByName(
(selectedProviderStatus?.skills ?? []).filter((s) => s.enabled),
);
const normalizedQuery = normalizeSearchQuery(composerTrigger.query, {
trimLeadingPattern: /^\$+/,
});
Expand Down
114 changes: 114 additions & 0 deletions apps/server/src/orchestration/ActivityPayloadProjection.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,120 @@ describe("projectActivityPayload agent-field survival", () => {
expect(data.somethingClientNeverReads).toBeUndefined();
});

it("keeps a bounded Codex command output summary", () => {
const projected = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
item: {
command: "/bin/zsh -lc 'printf hello'",
aggregatedOutput: `hello from codex\n${"x".repeat(5000)}`,
},
},
}),
);
const data = (projected.payload as Record<string, unknown>).data as Record<string, unknown>;
expect(data.item).toEqual({
command: "/bin/zsh -lc 'printf hello'",
aggregatedOutput: "hello from codex",
});
expect(JSON.stringify(projected.payload).length).toBeLessThan(500);
});

it("keeps preview normalization and fence-only fallback while scanning lines", () => {
const preview = projectActivityPayload(
activity({
itemType: "command_execution",
data: { rawOutput: `\`\`\`\n actual\tresult \n${"x".repeat(5000)}` },
}),
);
const fences = projectActivityPayload(
activity({
itemType: "command_execution",
data: { rawOutput: "```\r\n \t \n```\n" },
}),
);

expect((preview.payload as { data: { rawOutput: unknown } }).data.rawOutput).toEqual({
content: "actual result",
});
expect((fences.payload as { data: { rawOutput: unknown } }).data.rawOutput).toEqual({
content: "2 lines",
});
});

it("keeps bounded Claude and ACP command output summaries", () => {
const claude = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
command: "printf hello",
rawOutput: { stdout: `hello from claude\n${"y".repeat(5000)}` },
},
}),
);
const acp = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
command: "printf hello",
content: [
{
type: "content",
content: { type: "text", text: `hello from acp\n${"z".repeat(5000)}` },
},
],
},
}),
);

const claudeData = (claude.payload as Record<string, unknown>).data as Record<string, unknown>;
const acpData = (acp.payload as Record<string, unknown>).data as Record<string, unknown>;
expect(claudeData.rawOutput).toEqual({ content: "hello from claude" });
expect(acpData.rawOutput).toEqual({ content: "hello from acp" });
expect(JSON.stringify(claude.payload).length).toBeLessThan(500);
expect(JSON.stringify(acp.payload).length).toBeLessThan(500);
});

it("normalizes Claude and OpenCode command inputs before slimming provider data", () => {
const claude = projectActivityPayload(
activity({
itemType: "command_execution",
toolCallId: "claude-call-1",
data: {
toolName: "Bash",
input: { command: "vp test run" },
result: { content: "x".repeat(5_000) },
},
}),
);
const openCode = projectActivityPayload(
activity({
itemType: "command_execution",
toolCallId: "opencode-call-1",
data: {
tool: "bash",
state: {
status: "running",
input: { command: "vp lint" },
output: "x".repeat(5_000),
},
},
}),
);

expect(claude.payload).toMatchObject({
toolCallId: "claude-call-1",
data: { command: "vp test run" },
});
expect(openCode.payload).toMatchObject({
toolCallId: "opencode-call-1",
data: { command: "vp lint" },
});
expect(JSON.stringify(claude.payload).length).toBeLessThan(200);
expect(JSON.stringify(openCode.payload).length).toBeLessThan(200);
});

it("slims Codex-shaped mcp_tool_call items to rendered fields plus a result summary", () => {
const projected = projectActivityPayload(
activity({
Expand Down
129 changes: 105 additions & 24 deletions apps/server/src/orchestration/ActivityPayloadProjection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,36 +91,82 @@ function projectCommandData(data: Record<string, unknown>): Record<string, unkno
projectedItem.command = item.command;
}

const aggregatedOutput = asTrimmedString(item.aggregatedOutput);
if (aggregatedOutput) {
const summary = summarizeToolTextOutput(aggregatedOutput);
if (summary) {
projectedItem.aggregatedOutput = summary;
}
}

const input = asRecord(item.input);
if (input && "command" in input) {
projectedItem.input = { command: input.command };
}

const result = asRecord(item.result);
if (result && "command" in result) {
projectedItem.result = { command: result.command };
if (result) {
const projectedResult: Record<string, unknown> = {};
if ("command" in result) {
projectedResult.command = result.command;
}
const content = asTrimmedString(result.content);
if (content) {
const summary = summarizeToolTextOutput(content);
if (summary) {
projectedResult.content = summary;
}
}
if (Object.keys(projectedResult).length > 0) {
projectedItem.result = projectedResult;
}
}

return Object.keys(projectedItem).length > 0 ? projectedItem : undefined;
}

function projectCommandValue(data: Record<string, unknown>): unknown {
if (data.command !== undefined) {
return data.command;
}

const input = asRecord(data.input);
if (input?.command !== undefined) {
return input.command;
}

const stateInput = asRecord(asRecord(data.state)?.input);
if (stateInput?.command !== undefined) {
return stateInput.command;
}

return undefined;
}

function summarizeToolTextOutput(value: string): string | null {
const lines: string[] = [];
for (const rawLine of value.split(/\r?\n/u)) {
const line = rawLine.replace(/\s+/g, " ").trim();
let meaningfulLineCount = 0;
let offset = 0;

while (offset <= value.length) {
const newlineIndex = value.indexOf("\n", offset);
const lineEnd = newlineIndex === -1 ? value.length : newlineIndex;
const line = value.slice(offset, lineEnd).replace(/\s+/g, " ").trim();
if (line.length > 0) {
lines.push(line);
meaningfulLineCount += 1;
if (line !== "```") {
const summary = line.length <= 84 ? line : `${line.slice(0, 83).trimEnd()}…`;
// V8 can retain the full tool output behind a short sliced string.
// Join a tiny character array so the returned preview owns its bytes.
return Array.from(summary).join("");
}
}
if (newlineIndex === -1) {
break;
}
offset = newlineIndex + 1;
}

const firstLine = lines.find((line) => line !== "```");
if (firstLine) {
return firstLine.length <= 84 ? firstLine : `${firstLine.slice(0, 83).trimEnd()}…`;
}
if (lines.length > 1) {
return `${lines.length.toLocaleString()} lines`;
}
return null;
return meaningfulLineCount > 1 ? `${meaningfulLineCount.toLocaleString()} lines` : null;
}

/**
Expand DownExpand Up@@ -232,6 +278,12 @@ function projectMcpToolCallData(data: Record<string, unknown>): Record<string, u
}

function projectRawOutput(value: unknown): Record<string, unknown> | undefined {
const direct = asTrimmedString(value);
if (direct) {
const summary = summarizeToolTextOutput(direct);
return summary ? { content: summary } : undefined;
}

const rawOutput = asRecord(value);
if (!rawOutput) {
return undefined;
Expand All@@ -256,9 +308,34 @@ function projectRawOutput(value: unknown): Record<string, unknown> | undefined {
return summary ? { content: summary } : undefined;
}

const stderr = asTrimmedString(rawOutput.stderr);
if (stderr) {
const summary = summarizeToolTextOutput(stderr);
return summary ? { content: summary } : undefined;
}

return undefined;
}

function projectAcpContent(value: unknown): Record<string, unknown> | undefined {
if (!Array.isArray(value)) {
return undefined;
}

const text = value
.map((entryValue) => {
const entry = asRecord(entryValue);
const content = asRecord(entry?.content);
return entry?.type === "content" && content?.type === "text"
? asTrimmedString(content.text)
: null;
})
.filter((entry): entry is string => entry !== null)
.join("\n");
const summary = summarizeToolTextOutput(text);
return summary ? { content: summary } : undefined;
}

/**
* Removes activity payload fields that no current client reads while retaining
* the full payload in persistence and the event store.
Expand All@@ -272,11 +349,17 @@ export function projectActivityPayload(
return activity;
}

const itemStatus = asRecord(data.item)?.status;
const projectedPayload =
payload.status === "completed" && (itemStatus === "failed" || itemStatus === "declined")
? { ...payload, status: itemStatus }
: payload;

if (payload.itemType === "mcp_tool_call") {
return {
...activity,
payload: {
...payload,
...projectedPayload,
data: projectMcpToolCallData(data),
},
};
Expand All@@ -287,8 +370,9 @@ export function projectActivityPayload(
if (item) {
projectedData.item = item;
}
if ("command" in data) {
projectedData.command = data.command;
const command = projectCommandValue(data);
if (command !== undefined) {
projectedData.command = command;
}

const changedFiles: string[] = [];
Expand All@@ -305,15 +389,15 @@ export function projectActivityPayload(
projectedData.kind = data.kind;
}

const rawOutput = projectRawOutput(data.rawOutput);
const rawOutput = projectRawOutput(data.rawOutput) ?? projectAcpContent(data.content);
if (rawOutput) {
projectedData.rawOutput = rawOutput;
}

return {
...activity,
payload: {
...payload,
...projectedPayload,
data: projectedData,
},
};
Expand DownExpand Up@@ -412,9 +496,6 @@ function toolLifecycleIdentity(activity: OrchestrationThreadActivity): string |
* update within the turn — a later update belongs to a subsequent call that
* reuses the same identity and is still in flight. Rows without a lifecycle
* identity pass through, matching the clients, which never collapse them.
* Live `thread.activity-appended` events are untouched: updates still stream
* in real time and the completion supersedes them on the client as before.
*
* Deliberate divergence from client collapse: clients fold only *adjacent*
* lifecycle rows, so a superseded update separated from its completion by an
* interleaved parallel call renders as its own row today, and this drop
Expand All@@ -441,7 +522,7 @@ function dropSupersededToolUpdatedActivities(
if (!identity) {
continue;
}
const key = `${activity.turnId ?? ""}${identity}`;
const key = `${activity.turnId ?? ""}\u0000${identity}`;
const indices = completionIndicesByKey.get(key);
if (indices) {
indices.push(index);
Expand All@@ -461,7 +542,7 @@ function dropSupersededToolUpdatedActivities(
if (!identity) {
return true;
}
const indices = completionIndicesByKey.get(`${activity.turnId ?? ""}${identity}`);
const indices = completionIndicesByKey.get(`${activity.turnId ?? ""}\u0000${identity}`);
return !indices?.some((completionIndex) => completionIndex > index);
});
}
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/orchestration/Layers/CheckpointReactor.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ const make = Effect.gen(function* () {

const resolveThreadDetail = Effect.fn("resolveThreadDetail")(function* (threadId: ThreadId) {
return yield* projectionSnapshotQuery
.getThreadDetailById(threadId)
.getThreadDetailById(threadId, { activityKinds: [] })
.pipe(Effect.map(Option.getOrUndefined));
});

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion apps/mobile/src/features/threads/ThreadComposer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import type {
ProviderInteractionMode,
RuntimeMode,
ServerConfig as HelmCodeServerConfig,
ServerProviderSkill,
} from "@helmcode/contracts";
import {
detectComposerTrigger,
Expand DownExpand Up@@ -79,6 +80,20 @@ import { useThreadSettingsSheetPresentation } from "./use-thread-settings-sheet-
*/
export const COMPOSER_COLLAPSED_CHROME = 60;

function dedupeProviderSkillsByName(
skills: ReadonlyArray<ServerProviderSkill>,
): ServerProviderSkill[] {
const seenNames = new Set<string>();
return skills.filter((skill) => {
const normalizedName = skill.name.trim().toLowerCase();
if (seenNames.has(normalizedName)) {
return false;
}
seenNames.add(normalizedName);
return true;
});
}

/**
* Height of the expanded composer (card + toolbar + vertical padding, excluding safe-area inset).
* Used by the parent to compute the larger feed bottom inset when the composer is focused.
Expand DownExpand Up@@ -431,7 +446,9 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
}

if (composerTrigger.kind === "skill") {
const enabledSkills = (selectedProviderStatus?.skills ?? []).filter((s) => s.enabled);
const enabledSkills = dedupeProviderSkillsByName(
(selectedProviderStatus?.skills ?? []).filter((s) => s.enabled),
);
const normalizedQuery = normalizeSearchQuery(composerTrigger.query, {
trimLeadingPattern: /^\$+/,
});
Expand Down
114 changes: 114 additions & 0 deletions apps/server/src/orchestration/ActivityPayloadProjection.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,120 @@ describe("projectActivityPayload agent-field survival", () => {
expect(data.somethingClientNeverReads).toBeUndefined();
});

it("keeps a bounded Codex command output summary", () => {
const projected = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
item: {
command: "/bin/zsh -lc 'printf hello'",
aggregatedOutput: `hello from codex\n${"x".repeat(5000)}`,
},
},
}),
);
const data = (projected.payload as Record<string, unknown>).data as Record<string, unknown>;
expect(data.item).toEqual({
command: "/bin/zsh -lc 'printf hello'",
aggregatedOutput: "hello from codex",
});
expect(JSON.stringify(projected.payload).length).toBeLessThan(500);
});

it("keeps preview normalization and fence-only fallback while scanning lines", () => {
const preview = projectActivityPayload(
activity({
itemType: "command_execution",
data: { rawOutput: `\`\`\`\n actual\tresult \n${"x".repeat(5000)}` },
}),
);
const fences = projectActivityPayload(
activity({
itemType: "command_execution",
data: { rawOutput: "```\r\n \t \n```\n" },
}),
);

expect((preview.payload as { data: { rawOutput: unknown } }).data.rawOutput).toEqual({
content: "actual result",
});
expect((fences.payload as { data: { rawOutput: unknown } }).data.rawOutput).toEqual({
content: "2 lines",
});
});

it("keeps bounded Claude and ACP command output summaries", () => {
const claude = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
command: "printf hello",
rawOutput: { stdout: `hello from claude\n${"y".repeat(5000)}` },
},
}),
);
const acp = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
command: "printf hello",
content: [
{
type: "content",
content: { type: "text", text: `hello from acp\n${"z".repeat(5000)}` },
},
],
},
}),
);

const claudeData = (claude.payload as Record<string, unknown>).data as Record<string, unknown>;
const acpData = (acp.payload as Record<string, unknown>).data as Record<string, unknown>;
expect(claudeData.rawOutput).toEqual({ content: "hello from claude" });
expect(acpData.rawOutput).toEqual({ content: "hello from acp" });
expect(JSON.stringify(claude.payload).length).toBeLessThan(500);
expect(JSON.stringify(acp.payload).length).toBeLessThan(500);
});

it("normalizes Claude and OpenCode command inputs before slimming provider data", () => {
const claude = projectActivityPayload(
activity({
itemType: "command_execution",
toolCallId: "claude-call-1",
data: {
toolName: "Bash",
input: { command: "vp test run" },
result: { content: "x".repeat(5_000) },
},
}),
);
const openCode = projectActivityPayload(
activity({
itemType: "command_execution",
toolCallId: "opencode-call-1",
data: {
tool: "bash",
state: {
status: "running",
input: { command: "vp lint" },
output: "x".repeat(5_000),
},
},
}),
);

expect(claude.payload).toMatchObject({
toolCallId: "claude-call-1",
data: { command: "vp test run" },
});
expect(openCode.payload).toMatchObject({
toolCallId: "opencode-call-1",
data: { command: "vp lint" },
});
expect(JSON.stringify(claude.payload).length).toBeLessThan(200);
expect(JSON.stringify(openCode.payload).length).toBeLessThan(200);
});

it("slims Codex-shaped mcp_tool_call items to rendered fields plus a result summary", () => {
const projected = projectActivityPayload(
activity({
Expand Down
129 changes: 105 additions & 24 deletions apps/server/src/orchestration/ActivityPayloadProjection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,36 +91,82 @@ function projectCommandData(data: Record<string, unknown>): Record<string, unkno
projectedItem.command = item.command;
}

const aggregatedOutput = asTrimmedString(item.aggregatedOutput);
if (aggregatedOutput) {
const summary = summarizeToolTextOutput(aggregatedOutput);
if (summary) {
projectedItem.aggregatedOutput = summary;
}
}

const input = asRecord(item.input);
if (input && "command" in input) {
projectedItem.input = { command: input.command };
}

const result = asRecord(item.result);
if (result && "command" in result) {
projectedItem.result = { command: result.command };
if (result) {
const projectedResult: Record<string, unknown> = {};
if ("command" in result) {
projectedResult.command = result.command;
}
const content = asTrimmedString(result.content);
if (content) {
const summary = summarizeToolTextOutput(content);
if (summary) {
projectedResult.content = summary;
}
}
if (Object.keys(projectedResult).length > 0) {
projectedItem.result = projectedResult;
}
}

return Object.keys(projectedItem).length > 0 ? projectedItem : undefined;
}

function projectCommandValue(data: Record<string, unknown>): unknown {
if (data.command !== undefined) {
return data.command;
}

const input = asRecord(data.input);
if (input?.command !== undefined) {
return input.command;
}

const stateInput = asRecord(asRecord(data.state)?.input);
if (stateInput?.command !== undefined) {
return stateInput.command;
}

return undefined;
}

function summarizeToolTextOutput(value: string): string | null {
const lines: string[] = [];
for (const rawLine of value.split(/\r?\n/u)) {
const line = rawLine.replace(/\s+/g, " ").trim();
let meaningfulLineCount = 0;
let offset = 0;

while (offset <= value.length) {
const newlineIndex = value.indexOf("\n", offset);
const lineEnd = newlineIndex === -1 ? value.length : newlineIndex;
const line = value.slice(offset, lineEnd).replace(/\s+/g, " ").trim();
if (line.length > 0) {
lines.push(line);
meaningfulLineCount += 1;
if (line !== "```") {
const summary = line.length <= 84 ? line : `${line.slice(0, 83).trimEnd()}…`;
// V8 can retain the full tool output behind a short sliced string.
// Join a tiny character array so the returned preview owns its bytes.
return Array.from(summary).join("");
}
}
if (newlineIndex === -1) {
break;
}
offset = newlineIndex + 1;
}

const firstLine = lines.find((line) => line !== "```");
if (firstLine) {
return firstLine.length <= 84 ? firstLine : `${firstLine.slice(0, 83).trimEnd()}…`;
}
if (lines.length > 1) {
return `${lines.length.toLocaleString()} lines`;
}
return null;
return meaningfulLineCount > 1 ? `${meaningfulLineCount.toLocaleString()} lines` : null;
}

/**
Expand DownExpand Up@@ -232,6 +278,12 @@ function projectMcpToolCallData(data: Record<string, unknown>): Record<string, u
}

function projectRawOutput(value: unknown): Record<string, unknown> | undefined {
const direct = asTrimmedString(value);
if (direct) {
const summary = summarizeToolTextOutput(direct);
return summary ? { content: summary } : undefined;
}

const rawOutput = asRecord(value);
if (!rawOutput) {
return undefined;
Expand All@@ -256,9 +308,34 @@ function projectRawOutput(value: unknown): Record<string, unknown> | undefined {
return summary ? { content: summary } : undefined;
}

const stderr = asTrimmedString(rawOutput.stderr);
if (stderr) {
const summary = summarizeToolTextOutput(stderr);
return summary ? { content: summary } : undefined;
}

return undefined;
}

function projectAcpContent(value: unknown): Record<string, unknown> | undefined {
if (!Array.isArray(value)) {
return undefined;
}

const text = value
.map((entryValue) => {
const entry = asRecord(entryValue);
const content = asRecord(entry?.content);
return entry?.type === "content" && content?.type === "text"
? asTrimmedString(content.text)
: null;
})
.filter((entry): entry is string => entry !== null)
.join("\n");
const summary = summarizeToolTextOutput(text);
return summary ? { content: summary } : undefined;
}

/**
* Removes activity payload fields that no current client reads while retaining
* the full payload in persistence and the event store.
Expand All@@ -272,11 +349,17 @@ export function projectActivityPayload(
return activity;
}

const itemStatus = asRecord(data.item)?.status;
const projectedPayload =
payload.status === "completed" && (itemStatus === "failed" || itemStatus === "declined")
? { ...payload, status: itemStatus }
: payload;

if (payload.itemType === "mcp_tool_call") {
return {
...activity,
payload: {
...payload,
...projectedPayload,
data: projectMcpToolCallData(data),
},
};
Expand All@@ -287,8 +370,9 @@ export function projectActivityPayload(
if (item) {
projectedData.item = item;
}
if ("command" in data) {
projectedData.command = data.command;
const command = projectCommandValue(data);
if (command !== undefined) {
projectedData.command = command;
}

const changedFiles: string[] = [];
Expand All@@ -305,15 +389,15 @@ export function projectActivityPayload(
projectedData.kind = data.kind;
}

const rawOutput = projectRawOutput(data.rawOutput);
const rawOutput = projectRawOutput(data.rawOutput) ?? projectAcpContent(data.content);
if (rawOutput) {
projectedData.rawOutput = rawOutput;
}

return {
...activity,
payload: {
...payload,
...projectedPayload,
data: projectedData,
},
};
Expand DownExpand Up@@ -412,9 +496,6 @@ function toolLifecycleIdentity(activity: OrchestrationThreadActivity): string |
* update within the turn — a later update belongs to a subsequent call that
* reuses the same identity and is still in flight. Rows without a lifecycle
* identity pass through, matching the clients, which never collapse them.
* Live `thread.activity-appended` events are untouched: updates still stream
* in real time and the completion supersedes them on the client as before.
*
* Deliberate divergence from client collapse: clients fold only *adjacent*
* lifecycle rows, so a superseded update separated from its completion by an
* interleaved parallel call renders as its own row today, and this drop
Expand All@@ -441,7 +522,7 @@ function dropSupersededToolUpdatedActivities(
if (!identity) {
continue;
}
const key = `${activity.turnId ?? ""}${identity}`;
const key = `${activity.turnId ?? ""}\u0000${identity}`;
const indices = completionIndicesByKey.get(key);
if (indices) {
indices.push(index);
Expand All@@ -461,7 +542,7 @@ function dropSupersededToolUpdatedActivities(
if (!identity) {
return true;
}
const indices = completionIndicesByKey.get(`${activity.turnId ?? ""}${identity}`);
const indices = completionIndicesByKey.get(`${activity.turnId ?? ""}\u0000${identity}`);
return !indices?.some((completionIndex) => completionIndex > index);
});
}
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/orchestration/Layers/CheckpointReactor.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ const make = Effect.gen(function* () {

const resolveThreadDetail = Effect.fn("resolveThreadDetail")(function* (threadId: ThreadId) {
return yield* projectionSnapshotQuery
.getThreadDetailById(threadId)
.getThreadDetailById(threadId, { activityKinds: [] })
.pipe(Effect.map(Option.getOrUndefined));
});

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion apps/mobile/src/features/threads/ThreadComposer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import type {
ProviderInteractionMode,
RuntimeMode,
ServerConfig as HelmCodeServerConfig,
ServerProviderSkill,
} from "@helmcode/contracts";
import {
detectComposerTrigger,
Expand DownExpand Up@@ -79,6 +80,20 @@ import { useThreadSettingsSheetPresentation } from "./use-thread-settings-sheet-
*/
export const COMPOSER_COLLAPSED_CHROME = 60;

function dedupeProviderSkillsByName(
skills: ReadonlyArray<ServerProviderSkill>,
): ServerProviderSkill[] {
const seenNames = new Set<string>();
return skills.filter((skill) => {
const normalizedName = skill.name.trim().toLowerCase();
if (seenNames.has(normalizedName)) {
return false;
}
seenNames.add(normalizedName);
return true;
});
}

/**
* Height of the expanded composer (card + toolbar + vertical padding, excluding safe-area inset).
* Used by the parent to compute the larger feed bottom inset when the composer is focused.
Expand DownExpand Up@@ -431,7 +446,9 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
}

if (composerTrigger.kind === "skill") {
const enabledSkills = (selectedProviderStatus?.skills ?? []).filter((s) => s.enabled);
const enabledSkills = dedupeProviderSkillsByName(
(selectedProviderStatus?.skills ?? []).filter((s) => s.enabled),
);
const normalizedQuery = normalizeSearchQuery(composerTrigger.query, {
trimLeadingPattern: /^\$+/,
});
Expand Down
114 changes: 114 additions & 0 deletions apps/server/src/orchestration/ActivityPayloadProjection.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,120 @@ describe("projectActivityPayload agent-field survival", () => {
expect(data.somethingClientNeverReads).toBeUndefined();
});

it("keeps a bounded Codex command output summary", () => {
const projected = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
item: {
command: "/bin/zsh -lc 'printf hello'",
aggregatedOutput: `hello from codex\n${"x".repeat(5000)}`,
},
},
}),
);
const data = (projected.payload as Record<string, unknown>).data as Record<string, unknown>;
expect(data.item).toEqual({
command: "/bin/zsh -lc 'printf hello'",
aggregatedOutput: "hello from codex",
});
expect(JSON.stringify(projected.payload).length).toBeLessThan(500);
});

it("keeps preview normalization and fence-only fallback while scanning lines", () => {
const preview = projectActivityPayload(
activity({
itemType: "command_execution",
data: { rawOutput: `\`\`\`\n actual\tresult \n${"x".repeat(5000)}` },
}),
);
const fences = projectActivityPayload(
activity({
itemType: "command_execution",
data: { rawOutput: "```\r\n \t \n```\n" },
}),
);

expect((preview.payload as { data: { rawOutput: unknown } }).data.rawOutput).toEqual({
content: "actual result",
});
expect((fences.payload as { data: { rawOutput: unknown } }).data.rawOutput).toEqual({
content: "2 lines",
});
});

it("keeps bounded Claude and ACP command output summaries", () => {
const claude = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
command: "printf hello",
rawOutput: { stdout: `hello from claude\n${"y".repeat(5000)}` },
},
}),
);
const acp = projectActivityPayload(
activity({
itemType: "command_execution",
data: {
command: "printf hello",
content: [
{
type: "content",
content: { type: "text", text: `hello from acp\n${"z".repeat(5000)}` },
},
],
},
}),
);

const claudeData = (claude.payload as Record<string, unknown>).data as Record<string, unknown>;
const acpData = (acp.payload as Record<string, unknown>).data as Record<string, unknown>;
expect(claudeData.rawOutput).toEqual({ content: "hello from claude" });
expect(acpData.rawOutput).toEqual({ content: "hello from acp" });
expect(JSON.stringify(claude.payload).length).toBeLessThan(500);
expect(JSON.stringify(acp.payload).length).toBeLessThan(500);
});

it("normalizes Claude and OpenCode command inputs before slimming provider data", () => {
const claude = projectActivityPayload(
activity({
itemType: "command_execution",
toolCallId: "claude-call-1",
data: {
toolName: "Bash",
input: { command: "vp test run" },
result: { content: "x".repeat(5_000) },
},
}),
);
const openCode = projectActivityPayload(
activity({
itemType: "command_execution",
toolCallId: "opencode-call-1",
data: {
tool: "bash",
state: {
status: "running",
input: { command: "vp lint" },
output: "x".repeat(5_000),
},
},
}),
);

expect(claude.payload).toMatchObject({
toolCallId: "claude-call-1",
data: { command: "vp test run" },
});
expect(openCode.payload).toMatchObject({
toolCallId: "opencode-call-1",
data: { command: "vp lint" },
});
expect(JSON.stringify(claude.payload).length).toBeLessThan(200);
expect(JSON.stringify(openCode.payload).length).toBeLessThan(200);
});

it("slims Codex-shaped mcp_tool_call items to rendered fields plus a result summary", () => {
const projected = projectActivityPayload(
activity({
Expand Down
129 changes: 105 additions & 24 deletions apps/server/src/orchestration/ActivityPayloadProjection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,36 +91,82 @@ function projectCommandData(data: Record<string, unknown>): Record<string, unkno
projectedItem.command = item.command;
}

const aggregatedOutput = asTrimmedString(item.aggregatedOutput);
if (aggregatedOutput) {
const summary = summarizeToolTextOutput(aggregatedOutput);
if (summary) {
projectedItem.aggregatedOutput = summary;
}
}

const input = asRecord(item.input);
if (input && "command" in input) {
projectedItem.input = { command: input.command };
}

const result = asRecord(item.result);
if (result && "command" in result) {
projectedItem.result = { command: result.command };
if (result) {
const projectedResult: Record<string, unknown> = {};
if ("command" in result) {
projectedResult.command = result.command;
}
const content = asTrimmedString(result.content);
if (content) {
const summary = summarizeToolTextOutput(content);
if (summary) {
projectedResult.content = summary;
}
}
if (Object.keys(projectedResult).length > 0) {
projectedItem.result = projectedResult;
}
}

return Object.keys(projectedItem).length > 0 ? projectedItem : undefined;
}

function projectCommandValue(data: Record<string, unknown>): unknown {
if (data.command !== undefined) {
return data.command;
}

const input = asRecord(data.input);
if (input?.command !== undefined) {
return input.command;
}

const stateInput = asRecord(asRecord(data.state)?.input);
if (stateInput?.command !== undefined) {
return stateInput.command;
}

return undefined;
}

function summarizeToolTextOutput(value: string): string | null {
const lines: string[] = [];
for (const rawLine of value.split(/\r?\n/u)) {
const line = rawLine.replace(/\s+/g, " ").trim();
let meaningfulLineCount = 0;
let offset = 0;

while (offset <= value.length) {
const newlineIndex = value.indexOf("\n", offset);
const lineEnd = newlineIndex === -1 ? value.length : newlineIndex;
const line = value.slice(offset, lineEnd).replace(/\s+/g, " ").trim();
if (line.length > 0) {
lines.push(line);
meaningfulLineCount += 1;
if (line !== "```") {
const summary = line.length <= 84 ? line : `${line.slice(0, 83).trimEnd()}…`;
// V8 can retain the full tool output behind a short sliced string.
// Join a tiny character array so the returned preview owns its bytes.
return Array.from(summary).join("");
}
}
if (newlineIndex === -1) {
break;
}
offset = newlineIndex + 1;
}

const firstLine = lines.find((line) => line !== "```");
if (firstLine) {
return firstLine.length <= 84 ? firstLine : `${firstLine.slice(0, 83).trimEnd()}…`;
}
if (lines.length > 1) {
return `${lines.length.toLocaleString()} lines`;
}
return null;
return meaningfulLineCount > 1 ? `${meaningfulLineCount.toLocaleString()} lines` : null;
}

/**
Expand DownExpand Up@@ -232,6 +278,12 @@ function projectMcpToolCallData(data: Record<string, unknown>): Record<string, u
}

function projectRawOutput(value: unknown): Record<string, unknown> | undefined {
const direct = asTrimmedString(value);
if (direct) {
const summary = summarizeToolTextOutput(direct);
return summary ? { content: summary } : undefined;
}

const rawOutput = asRecord(value);
if (!rawOutput) {
return undefined;
Expand All@@ -256,9 +308,34 @@ function projectRawOutput(value: unknown): Record<string, unknown> | undefined {
return summary ? { content: summary } : undefined;
}

const stderr = asTrimmedString(rawOutput.stderr);
if (stderr) {
const summary = summarizeToolTextOutput(stderr);
return summary ? { content: summary } : undefined;
}

return undefined;
}

function projectAcpContent(value: unknown): Record<string, unknown> | undefined {
if (!Array.isArray(value)) {
return undefined;
}

const text = value
.map((entryValue) => {
const entry = asRecord(entryValue);
const content = asRecord(entry?.content);
return entry?.type === "content" && content?.type === "text"
? asTrimmedString(content.text)
: null;
})
.filter((entry): entry is string => entry !== null)
.join("\n");
const summary = summarizeToolTextOutput(text);
return summary ? { content: summary } : undefined;
}

/**
* Removes activity payload fields that no current client reads while retaining
* the full payload in persistence and the event store.
Expand All@@ -272,11 +349,17 @@ export function projectActivityPayload(
return activity;
}

const itemStatus = asRecord(data.item)?.status;
const projectedPayload =
payload.status === "completed" && (itemStatus === "failed" || itemStatus === "declined")
? { ...payload, status: itemStatus }
: payload;

if (payload.itemType === "mcp_tool_call") {
return {
...activity,
payload: {
...payload,
...projectedPayload,
data: projectMcpToolCallData(data),
},
};
Expand All@@ -287,8 +370,9 @@ export function projectActivityPayload(
if (item) {
projectedData.item = item;
}
if ("command" in data) {
projectedData.command = data.command;
const command = projectCommandValue(data);
if (command !== undefined) {
projectedData.command = command;
}

const changedFiles: string[] = [];
Expand All@@ -305,15 +389,15 @@ export function projectActivityPayload(
projectedData.kind = data.kind;
}

const rawOutput = projectRawOutput(data.rawOutput);
const rawOutput = projectRawOutput(data.rawOutput) ?? projectAcpContent(data.content);
if (rawOutput) {
projectedData.rawOutput = rawOutput;
}

return {
...activity,
payload: {
...payload,
...projectedPayload,
data: projectedData,
},
};
Expand DownExpand Up@@ -412,9 +496,6 @@ function toolLifecycleIdentity(activity: OrchestrationThreadActivity): string |
* update within the turn — a later update belongs to a subsequent call that
* reuses the same identity and is still in flight. Rows without a lifecycle
* identity pass through, matching the clients, which never collapse them.
* Live `thread.activity-appended` events are untouched: updates still stream
* in real time and the completion supersedes them on the client as before.
*
* Deliberate divergence from client collapse: clients fold only *adjacent*
* lifecycle rows, so a superseded update separated from its completion by an
* interleaved parallel call renders as its own row today, and this drop
Expand All@@ -441,7 +522,7 @@ function dropSupersededToolUpdatedActivities(
if (!identity) {
continue;
}
const key = `${activity.turnId ?? ""}${identity}`;
const key = `${activity.turnId ?? ""}\u0000${identity}`;
const indices = completionIndicesByKey.get(key);
if (indices) {
indices.push(index);
Expand All@@ -461,7 +542,7 @@ function dropSupersededToolUpdatedActivities(
if (!identity) {
return true;
}
const indices = completionIndicesByKey.get(`${activity.turnId ?? ""}${identity}`);
const indices = completionIndicesByKey.get(`${activity.turnId ?? ""}\u0000${identity}`);
return !indices?.some((completionIndex) => completionIndex > index);
});
}
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/orchestration/Layers/CheckpointReactor.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ const make = Effect.gen(function* () {

const resolveThreadDetail = Effect.fn("resolveThreadDetail")(function* (threadId: ThreadId) {
return yield* projectionSnapshotQuery
.getThreadDetailById(threadId)
.getThreadDetailById(threadId, { activityKinds: [] })
.pipe(Effect.map(Option.getOrUndefined));
});

Expand Down
Loading
Loading