mirror of
https://github.com/AutoMaker-Org/automaker.git
synced 2026-03-26 00:53:08 +00:00
Feature: worktree view customization and stability fixes (#805)
* Changes from feature/worktree-view-customization * Feature: Git sync, set-tracking, and push divergence handling (#796) * Add quick-add feature with improved workflows (#802) * Changes from feature/quick-add * feat: Clarify system prompt and improve error handling across services. Address PR Feedback * feat: Improve PR description parsing and refactor event handling * feat: Add context options to pipeline orchestrator initialization * fix: Deduplicate React and handle CJS interop for use-sync-external-store Resolve "Cannot read properties of null (reading 'useState')" errors by deduplicating React/react-dom and ensuring use-sync-external-store is bundled together with React to prevent CJS packages from resolving to different React instances. * Changes from feature/worktree-view-customization * refactor: Remove unused worktree swap and highlight props * refactor: Consolidate feature completion logic and improve thinking level defaults * feat: Increase max turn limit to 10000 - Update DEFAULT_MAX_TURNS from 1000 to 10000 in settings-helpers.ts and agent-executor.ts - Update MAX_ALLOWED_TURNS from 2000 to 10000 in settings-helpers.ts - Update UI clamping logic from 2000 to 10000 in app-store.ts - Update fallback values from 1000 to 10000 in use-settings-sync.ts - Update default value from 1000 to 10000 in DEFAULT_GLOBAL_SETTINGS - Update documentation to reflect new range: 1-10000 Allows agents to perform up to 10000 turns for complex feature execution. Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com> * feat: Add model resolution, improve session handling, and enhance UI stability * refactor: Remove unused sync and tracking branch props from worktree components * feat: Add PR number update functionality to worktrees. Address pr feedback * feat: Optimize Gemini CLI startup and add tool result tracking * refactor: Improve error handling and simplify worktree task cleanup --------- Co-authored-by: Claude Haiku 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -487,7 +487,19 @@ export class AgentService {
|
||||
Object.keys(customSubagents).length > 0;
|
||||
|
||||
// Base tools that match the provider's default set
|
||||
const baseTools = ['Read', 'Write', 'Edit', 'Glob', 'Grep', 'Bash', 'WebSearch', 'WebFetch'];
|
||||
const baseTools = [
|
||||
'Read',
|
||||
'Write',
|
||||
'Edit',
|
||||
'MultiEdit',
|
||||
'Glob',
|
||||
'Grep',
|
||||
'LS',
|
||||
'Bash',
|
||||
'WebSearch',
|
||||
'WebFetch',
|
||||
'TodoWrite',
|
||||
];
|
||||
|
||||
if (allowedTools) {
|
||||
allowedTools = [...allowedTools]; // Create a copy to avoid mutating SDK options
|
||||
@@ -572,6 +584,7 @@ export class AgentService {
|
||||
let currentAssistantMessage: Message | null = null;
|
||||
let responseText = '';
|
||||
const toolUses: Array<{ name: string; input: unknown }> = [];
|
||||
const toolNamesById = new Map<string, string>();
|
||||
|
||||
for await (const msg of stream) {
|
||||
// Capture SDK session ID from any message and persist it.
|
||||
@@ -616,11 +629,50 @@ export class AgentService {
|
||||
input: block.input,
|
||||
};
|
||||
toolUses.push(toolUse);
|
||||
if (block.tool_use_id) {
|
||||
toolNamesById.set(block.tool_use_id, toolUse.name);
|
||||
}
|
||||
|
||||
this.emitAgentEvent(sessionId, {
|
||||
type: 'tool_use',
|
||||
tool: toolUse,
|
||||
});
|
||||
} else if (block.type === 'tool_result') {
|
||||
const toolUseId = block.tool_use_id;
|
||||
const toolName = toolUseId ? toolNamesById.get(toolUseId) : undefined;
|
||||
|
||||
// Normalize block.content to a string for the emitted event
|
||||
const rawContent: unknown = block.content;
|
||||
let contentString: string;
|
||||
if (typeof rawContent === 'string') {
|
||||
contentString = rawContent;
|
||||
} else if (Array.isArray(rawContent)) {
|
||||
// Extract text from content blocks (TextBlock, ImageBlock, etc.)
|
||||
contentString = rawContent
|
||||
.map((part: { text?: string; type?: string }) => {
|
||||
if (typeof part === 'string') return part;
|
||||
if (part.text) return part.text;
|
||||
// For non-text blocks (e.g., images), represent as type indicator
|
||||
if (part.type) return `[${part.type}]`;
|
||||
return JSON.stringify(part);
|
||||
})
|
||||
.join('\n');
|
||||
} else if (rawContent !== undefined && rawContent !== null) {
|
||||
contentString = JSON.stringify(rawContent);
|
||||
} else {
|
||||
contentString = '';
|
||||
}
|
||||
|
||||
this.emitAgentEvent(sessionId, {
|
||||
type: 'tool_result',
|
||||
tool: {
|
||||
name: toolName || 'unknown',
|
||||
input: {
|
||||
toolUseId,
|
||||
content: contentString,
|
||||
},
|
||||
},
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user