Skip to content

Commit 88c0ba5

Browse files
committed
Track copied files via metadata and update antigravity agent arguments
- cli > edit. In metadata.json store paths so that file deletions are detected during application. - in metadata json, replace file mappings with a simple array of relative paths in 'files' key └── apps └── editor ├── package.json └── src ├── commands │ └── apply-from-terminal-command.ts ├── extension.ts ├── utils │ └── agentic-cli-invocation │ ├── invoke-agentic-cli.ts │ └── utils │ └── generate-diff-markdown.ts └── views └── prompt ├── backend │ ├── message-handlers │ │ ├── handle-apply-from.ts │ │ └── handle-invoke-agentic-cli.ts │ └── prompt-view-provider.ts └── frontend └── Main ├── Main.tsx └── MainView ├── MainView.tsx └── components └── Header └── Header.tsx
1 parent b5bb9a8 commit 88c0ba5

3 files changed

Lines changed: 71 additions & 35 deletions

File tree

‎apps/editor/src/commands/apply-from-terminal-command.ts‎

Lines changed: 43 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,60 @@ const build_diff_from_sandbox = async (
1919
{ original: string; dest_rel: string }
2020
>()
2121

22-
const temp_files = await get_all_files(sandbox_dir)
2322
const workspace_folders = vscode.workspace.workspaceFolders || []
2423

25-
for (const temp_file of temp_files) {
26-
const rel_path = path.relative(sandbox_dir, temp_file)
27-
const unix_rel_path = rel_path.replace(/\\/g, '/')
28-
29-
let original_path: string | undefined
30-
24+
const resolve_original_path = (unix_rel_path: string) => {
3125
if (workspace_folders.length === 1) {
32-
original_path = path.join(workspace_folders[0].uri.fsPath, rel_path)
26+
return path.join(workspace_folders[0].uri.fsPath, unix_rel_path)
3327
} else if (workspace_folders.length > 1) {
3428
const parts = unix_rel_path.split('/')
3529
const ws_name = parts[0]
3630
const folder = workspace_folders.find((f) => f.name === ws_name)
3731
if (folder) {
38-
original_path = path.join(folder.uri.fsPath, parts.slice(1).join('/'))
32+
return path.join(folder.uri.fsPath, parts.slice(1).join('/'))
3933
} else {
40-
original_path = path.join(workspace_folders[0].uri.fsPath, rel_path)
34+
return path.join(workspace_folders[0].uri.fsPath, unix_rel_path)
35+
}
36+
}
37+
return undefined
38+
}
39+
40+
try {
41+
const metadata_path = path.join(sandbox_dir, '.cwc', 'metadata.json')
42+
const metadata_content = await fs.promises.readFile(metadata_path, 'utf-8')
43+
const metadata = JSON.parse(metadata_content)
44+
if (metadata && metadata.files && Array.isArray(metadata.files)) {
45+
for (const rel_path of metadata.files) {
46+
const original = resolve_original_path(rel_path)
47+
if (original) {
48+
file_mappings.set(path.join(sandbox_dir, rel_path), {
49+
original,
50+
dest_rel: rel_path
51+
})
52+
}
4153
}
4254
}
55+
} catch {
56+
// Ignore
57+
}
58+
59+
const temp_files = await get_all_files(sandbox_dir)
60+
61+
for (const temp_file of temp_files) {
62+
const temp_file_resolved = path.resolve(temp_file)
63+
let has_mapping = false
64+
for (const key of file_mappings.keys()) {
65+
if (path.resolve(key) === temp_file_resolved) {
66+
has_mapping = true
67+
break
68+
}
69+
}
70+
if (has_mapping) continue
71+
72+
const rel_path = path.relative(sandbox_dir, temp_file)
73+
const unix_rel_path = rel_path.replace(/\\/g, '/')
74+
75+
const original_path = resolve_original_path(unix_rel_path)
4376

4477
if (original_path) {
4578
try {

‎apps/editor/src/utils/agentic-cli-invocation/agents/antigravity.ts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,8 @@ export const antigravity_agent: CodingAgent = {
1515
cmd: 'agy',
1616
is_installed: () => check_command_exists('agy'),
1717
get_documentation_url: () => AGENTS[agent_name].docs_url,
18-
get_headless_args: () => [
19-
'--output-format',
20-
'stream-json',
21-
'--dangerously-skip-permissions'
22-
],
23-
get_integrated_terminal_edit_args: () => [],
18+
get_headless_args: () => ['--output-format', 'stream-json', '--mode', 'auto'],
19+
get_integrated_terminal_edit_args: () => ['--mode', 'auto'],
2420
get_integrated_terminal_ask_args: () => [],
2521
get_integrated_terminal_prompt_args: (temp_prompt_path: string) => {
2622
if (os.platform() === 'win32') {

‎apps/editor/src/utils/agentic-cli-invocation/invoke-agentic-cli.ts‎

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -376,24 +376,7 @@ export const invoke_agentic_cli = async (params: {
376376
path.join(os.tmpdir(), prefix)
377377
)
378378

379-
try {
380-
const metadata_dir = path.join(temp_dir_path, '.cwc')
381-
await fs.promises.mkdir(metadata_dir, { recursive: true })
382-
await fs.promises.writeFile(
383-
path.join(metadata_dir, 'metadata.json'),
384-
JSON.stringify({
385-
agent: selected_agent_info?.label,
386-
flags: flags_string
387-
}),
388-
'utf-8'
389-
)
390-
} catch (e) {
391-
Logger.warn({
392-
function_name: 'invoke_agentic_cli',
393-
message: 'Failed to write metadata',
394-
data: e
395-
})
396-
}
379+
const files_array: string[] = []
397380

398381
if (params.copy_selected_files) {
399382
const selected_files = params.workspace_provider.get_selected_files()
@@ -417,13 +400,37 @@ export const invoke_agentic_cli = async (params: {
417400
})
418401
await fs.promises.copyFile(file_path, dest_path)
419402

403+
const unix_dest_rel = dest_rel.replace(/\\/g, '/')
404+
420405
file_mappings.set(dest_path, {
421406
original: file_path,
422-
dest_rel: dest_rel.replace(/\\/g, '/')
407+
dest_rel: unix_dest_rel
423408
})
409+
410+
files_array.push(unix_dest_rel)
424411
}
425412
}
426413

414+
try {
415+
const metadata_dir = path.join(temp_dir_path, '.cwc')
416+
await fs.promises.mkdir(metadata_dir, { recursive: true })
417+
await fs.promises.writeFile(
418+
path.join(metadata_dir, 'metadata.json'),
419+
JSON.stringify({
420+
agent: selected_agent_info?.label,
421+
flags: flags_string,
422+
files: files_array
423+
}),
424+
'utf-8'
425+
)
426+
} catch (e) {
427+
Logger.warn({
428+
function_name: 'invoke_agentic_cli',
429+
message: 'Failed to write metadata',
430+
data: e
431+
})
432+
}
433+
427434
selected_root = temp_dir_path
428435
} else if (params.target_folder) {
429436
selected_root = params.target_folder

0 commit comments

Comments
 (0)