Skip to content

Commit 15a3bbb

Browse files
committed
Migrate prompt image storage to persistent storage using a generalized storage class
- revert all those lint fixes [Changes] - In `apps/editor/src/utils/agentic-cli-invocation/invoke-agentic-cli.ts`, update the `params.isolate_in_temp_dir` branch to always create a fresh temp directory via `mkdtemp` in `os.tmpdir()` with a `'cwc-cli-'` prefix instead of reusing the `cwc-cli-ask` path in `globalStorageUri`. - images pasted into prompt field should not be saved as base64 encoded text, but .png files - we like the idea of saving 'prompt text' to extension's global storage, you should save pasted images there as well. use identical garbage collection mechanism for them as for pasted text. Don't need backward compatibility. - merge `apps/editor/src/views/prompt/backend/utils/persistent-text-storage.ts` and `apps/editor/src/views/prompt/backend/utils/persistent-image-storage.ts` into persistent-prompt-storage.ts (steer behavior via params) - move the threshold to `apps/editor/src/constants/values.ts`, shorten it to 6 months ├── apps │ └── editor │ └── src │ ├── commands │ │ ├── apply-response-command │ │ │ ├── response-processor │ │ │ │ └── response-processor.ts │ │ │ └── utils │ │ │ ├── file-operations │ │ │ │ ├── prepare-rename-operation.ts │ │ │ │ └── read-rename-source-file.ts │ │ │ └── preview │ │ │ ├── build-history-files.ts │ │ │ ├── file-preparer.ts │ │ │ └── vscode-ui.ts │ │ ├── code-at-cursor-command │ │ │ └── utils │ │ │ └── perform-code-at-cursor.ts │ │ ├── copy-merge-commit-details-command.ts │ │ ├── generate-commit-message-commands │ │ │ └── actions │ │ │ └── run-generate-action.ts │ │ ├── new-folder-command.ts │ │ ├── search-files-commands │ │ │ └── utils │ │ │ └── get-target-folder-path.ts │ │ └── select-files-of-commit-command.ts │ ├── constants │ │ └── values.ts │ ├── features │ │ ├── agentic-search │ │ │ └── agentic-search.ts │ │ └── search-files │ │ ├── search-modes │ │ │ └── perform-intelligent-search-mode.ts │ │ └── utils │ │ └── analyze-files.ts │ ├── services │ │ └── websocket-manager.ts │ ├── utils │ │ ├── agentic-cli-invocation │ │ │ ├── agents │ │ │ │ ├── antigravity.ts │ │ │ │ ├── claude.ts │ │ │ │ ├── codex.ts │ │ │ │ ├── cursor.ts │ │ │ │ ├── devin.ts │ │ │ │ ├── grok.ts │ │ │ │ ├── index.ts │ │ │ │ └── opencode.ts │ │ │ ├── index.ts │ │ │ ├── invoke-agentic-cli.ts │ │ │ ├── types.ts │ │ │ └── utils │ │ │ ├── check-command-exists.ts │ │ │ ├── format-duration.ts │ │ │ ├── generate-diff-markdown.ts │ │ │ └── get-progress-dots.ts │ │ ├── build-user-content.ts │ │ ├── git-repository-utils.ts │ │ └── path-sanitizer.ts │ └── views │ ├── prompt │ │ ├── backend │ │ │ ├── message-handlers │ │ │ │ ├── handle-open-prompt-image.ts │ │ │ │ ├── handle-open-prompt-pasted-text.ts │ │ │ │ ├── handle-open-website.ts │ │ │ │ ├── handle-paste-url.ts │ │ │ │ ├── handle-patch-repair.ts │ │ │ │ ├── handle-preview-generated-code.ts │ │ │ │ ├── handle-save-prompt-image.ts │ │ │ │ ├── handle-save-prompt-pasted-text.ts │ │ │ │ ├── handle-voice-input.ts │ │ │ │ └── index.ts │ │ │ ├── prompt-view-provider.ts │ │ │ └── utils │ │ │ ├── persistent-prompt-storage.ts │ │ │ ├── preview-text-in-temp-file.ts │ │ │ ├── symbols │ │ │ │ ├── fragment │ │ │ │ │ └── replace-fragment-symbol.ts │ │ │ │ ├── image │ │ │ │ │ └── replace-image-symbol.ts │ │ │ │ ├── pasted-text │ │ │ │ │ └── replace-pasted-text-symbol.ts │ │ │ │ ├── replace-symbols.ts │ │ │ │ └── website │ │ │ │ └── replace-website-symbol.ts │ │ │ └── website-fetcher.ts │ │ ├── frontend │ │ │ ├── Main │ │ │ │ ├── Main.tsx │ │ │ │ └── MainView │ │ │ │ └── MainView.tsx │ │ │ ├── Prompt.tsx │ │ │ └── hooks │ │ │ └── use-prompt │ │ │ └── use-prompt.ts │ │ └── types │ │ └── messages.ts │ └── settings │ └── backend │ └── message-handlers │ ├── add-provider │ │ └── pick-extended-provider.ts │ ├── handle-open-allow-patterns-settings.ts │ └── handle-open-ignore-patterns-settings.ts └── packages ├── shared │ └── src │ └── utils │ └── simplify-prompt-symbols │ └── simplify-prompt-symbols.ts └── ui └── src └── components └── editor └── common └── prompts ├── PromptField │ ├── PromptField.tsx │ └── hooks │ └── use-handlers │ ├── handle-paste.ts │ ├── types.ts │ └── use-handlers.ts └── shared └── symbols └── reconstruct-raw-value.ts
1 parent 39c2aac commit 15a3bbb

15 files changed

Lines changed: 90 additions & 112 deletions

‎apps/editor/src/constants/values.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
export const CHECKPOINT_DEFAULT_LIFESPAN = 72
2+
export const GARBAGE_COLLECTION_THRESHOLD = 15552000000 // 6 months
23
export const MAX_FILE_TOKENS_FOR_COMMIT_MESSAGE = 20000
34
export const MAX_PROMPT_CHARS_IN_COMMIT_MESSAGE = 1000
45
export const GIT_LOG_SINCE_DURATION = '6 months ago'

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

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -367,21 +367,9 @@ export const invoke_agentic_cli = async (params: {
367367
>()
368368

369369
if (params.isolate_in_temp_dir) {
370-
if (params.copy_selected_files) {
371-
temp_dir_path = await fs.promises.mkdtemp(
372-
path.join(os.tmpdir(), 'cwc-cli-edit-')
373-
)
374-
} else {
375-
// Reuse directory to avoid repeated permission asks
376-
const global_storage_path =
377-
params.extension_context.globalStorageUri.fsPath
378-
if (!fs.existsSync(global_storage_path)) {
379-
await fs.promises.mkdir(global_storage_path, { recursive: true })
380-
}
381-
temp_dir_path = path.join(global_storage_path, 'cwc-cli-ask')
382-
await fs.promises.rm(temp_dir_path, { recursive: true, force: true })
383-
await fs.promises.mkdir(temp_dir_path, { recursive: true })
384-
}
370+
temp_dir_path = await fs.promises.mkdtemp(
371+
path.join(os.tmpdir(), 'cwc-cli-')
372+
)
385373

386374
if (params.copy_selected_files) {
387375
const selected_files = params.workspace_provider.get_selected_files()

‎apps/editor/src/views/prompt/backend/message-handlers/handle-open-prompt-image.ts‎

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,33 @@
11
import * as fs from 'fs'
2-
import * as os from 'os'
3-
import * as path from 'path'
42
import * as vscode from 'vscode'
53
import { OpenPromptImageMessage } from '../../types/messages'
4+
import { PromptViewProvider } from '../prompt-view-provider'
5+
import { PersistentPromptStorage } from '../utils/persistent-prompt-storage'
66

77
export const handle_open_prompt_image = async (
8+
prompt_view_provider: PromptViewProvider,
89
message: OpenPromptImageMessage
910
) => {
1011
try {
1112
const hash = message.hash
12-
if (!/^[a-fA-F0-9]{16,64}$/.test(hash)) {
13-
throw new Error('Invalid image hash')
14-
}
15-
const txt_filename = `cwc-image-${hash}.txt`
16-
const txt_path = path.join(os.tmpdir(), txt_filename)
13+
const storage = new PersistentPromptStorage(
14+
prompt_view_provider.extension_context,
15+
'image'
16+
)
17+
const file_path = storage.get_file_path(hash)
1718

18-
// Read base64 content
19-
let content_base64: string
19+
// Verify the file exists before attempting to open
2020
try {
21-
content_base64 = await fs.promises.readFile(txt_path, 'utf-8')
22-
} catch (err) {
23-
if ((err as NodeJS.ErrnoException).code === 'ENOENT') {
24-
vscode.window.showErrorMessage(
25-
'Image file not found (it may have been deleted).'
26-
)
27-
return
28-
}
29-
throw err
21+
await fs.promises.access(file_path)
22+
} catch {
23+
vscode.window.showErrorMessage(
24+
'Image file not found (it may have been deleted).'
25+
)
26+
return
3027
}
3128

32-
const buffer = Buffer.from(content_base64, 'base64')
33-
34-
// Create a png file for viewing
35-
const png_dir = await fs.promises.mkdtemp(
36-
path.join(os.tmpdir(), 'cwc-image-')
37-
)
38-
const png_filename = `cwc-image-${hash}.png`
39-
const png_path = path.join(png_dir, png_filename)
40-
41-
await fs.promises.writeFile(png_path, new Uint8Array(buffer), {
42-
mode: 0o600
43-
})
44-
4529
// Open the image
46-
const uri = vscode.Uri.file(png_path)
30+
const uri = vscode.Uri.file(file_path)
4731
await vscode.commands.executeCommand('vscode.open', uri)
4832
} catch (error) {
4933
vscode.window.showErrorMessage(`Failed to open image: ${error}`)

‎apps/editor/src/views/prompt/backend/message-handlers/handle-open-prompt-pasted-text.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
import * as vscode from 'vscode'
22
import { OpenPromptPastedTextMessage } from '../../types/messages'
33
import { PromptViewProvider } from '../prompt-view-provider'
4-
import { PersistentTextStorage } from '../utils/persistent-text-storage'
4+
import { PersistentPromptStorage } from '../utils/persistent-prompt-storage'
55

66
export const handle_open_prompt_pasted_text = async (
77
prompt_view_provider: PromptViewProvider,
88
message: OpenPromptPastedTextMessage
99
) => {
1010
try {
11-
const storage = new PersistentTextStorage(
12-
prompt_view_provider.extension_context
11+
const storage = new PersistentPromptStorage(
12+
prompt_view_provider.extension_context,
13+
'text'
1314
)
1415
const file_path = storage.get_file_path(message.id)
1516

‎apps/editor/src/views/prompt/backend/message-handlers/handle-open-website.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { marked } from 'marked'
55
import { JSDOM } from 'jsdom'
66
import createDOMPurify from 'dompurify'
77
import { PromptViewProvider } from '../prompt-view-provider'
8-
import { PersistentTextStorage } from '../utils/persistent-text-storage'
8+
import { PersistentPromptStorage } from '../utils/persistent-prompt-storage'
99

1010
let current_preview_url: string | undefined
1111

@@ -39,8 +39,9 @@ export const handle_open_website = async (
3939
}
4040
}
4141

42-
const storage = new PersistentTextStorage(
43-
prompt_view_provider.extension_context
42+
const storage = new PersistentPromptStorage(
43+
prompt_view_provider.extension_context,
44+
'text'
4445
)
4546
const file_path = id ? storage.get_file_path(id) : ''
4647

‎apps/editor/src/views/prompt/backend/message-handlers/handle-paste-url.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as vscode from 'vscode'
22
import { PasteUrlMessage } from '../../types/messages'
33
import { PromptViewProvider } from '../prompt-view-provider'
44
import { fetch_website } from '../utils/website-fetcher'
5-
import { PersistentTextStorage } from '../utils/persistent-text-storage'
5+
import { PersistentPromptStorage } from '../utils/persistent-prompt-storage'
66

77
export const handle_paste_url = async (
88
prompt_view_provider: PromptViewProvider,
@@ -20,8 +20,9 @@ export const handle_paste_url = async (
2020
}
2121

2222
try {
23-
const storage = new PersistentTextStorage(
24-
prompt_view_provider.extension_context
23+
const storage = new PersistentPromptStorage(
24+
prompt_view_provider.extension_context,
25+
'text'
2526
)
2627

2728
const abort_controller = new AbortController()

‎apps/editor/src/views/prompt/backend/message-handlers/handle-save-prompt-image.ts‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
1-
import * as crypto from 'crypto'
2-
import * as fs from 'fs'
3-
import * as os from 'os'
4-
import * as path from 'path'
51
import * as vscode from 'vscode'
62
import { SavePromptImageMessage } from '../../types/messages'
73
import { PromptViewProvider } from '../prompt-view-provider'
4+
import { PersistentPromptStorage } from '../utils/persistent-prompt-storage'
85

96
export const handle_save_prompt_image = async (
107
prompt_view_provider: PromptViewProvider,
118
message: SavePromptImageMessage
129
) => {
1310
try {
14-
const buffer = Buffer.from(message.content_base64, 'base64')
15-
const hash = crypto
16-
.createHash('sha256')
17-
.update(new Uint8Array(buffer))
18-
.digest('hex')
19-
.substring(0, 16)
20-
const filename = `cwc-image-${hash}.txt`
21-
const file_path = path.join(os.tmpdir(), filename)
22-
await fs.promises.writeFile(file_path, message.content_base64, 'utf-8')
11+
const storage = new PersistentPromptStorage(
12+
prompt_view_provider.extension_context,
13+
'image'
14+
)
15+
const hash = await storage.save(message.content_base64)
2316
prompt_view_provider.add_text_at_cursor_position(`#Image(${hash})`)
2417
} catch (error) {
2518
vscode.window.showErrorMessage(`Failed to save image: ${error}`)

‎apps/editor/src/views/prompt/backend/message-handlers/handle-save-prompt-pasted-text.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
import * as vscode from 'vscode'
22
import { SavePromptPastedTextMessage } from '../../types/messages'
33
import { PromptViewProvider } from '../prompt-view-provider'
4-
import { PersistentTextStorage } from '../utils/persistent-text-storage'
4+
import { PersistentPromptStorage } from '../utils/persistent-prompt-storage'
55

66
export const handle_save_prompt_pasted_text = async (
77
prompt_view_provider: PromptViewProvider,
88
message: SavePromptPastedTextMessage
99
) => {
1010
try {
11-
const storage = new PersistentTextStorage(
12-
prompt_view_provider.extension_context
11+
const storage = new PersistentPromptStorage(
12+
prompt_view_provider.extension_context,
13+
'text'
1314
)
1415
const id = await storage.save(message.text)
1516

‎apps/editor/src/views/prompt/backend/prompt-view-provider.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ export class PromptViewProvider implements vscode.WebviewViewProvider {
764764
} else if (message.command === 'SAVE_PROMPT_IMAGE') {
765765
await handlers.handle_save_prompt_image(this, message)
766766
} else if (message.command === 'OPEN_PROMPT_IMAGE') {
767-
await handlers.handle_open_prompt_image(message)
767+
await handlers.handle_open_prompt_image(this, message)
768768
} else if (message.command === 'SAVE_PROMPT_PASTED_TEXT') {
769769
await handlers.handle_save_prompt_pasted_text(this, message)
770770
} else if (message.command === 'OPEN_PROMPT_PASTED_TEXT') {

‎apps/editor/src/views/prompt/backend/utils/index.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ export * from './estimate-token-count'
22
export * from './get-display-path-for-editor'
33
export * from './get-valid-web-configurations'
44
export * from './insert-text-at-caret'
5-
export * from './persistent-text-storage'
65
export * from './preview-text-in-temp-file'
76
export * from './website-fetcher'
87
export * from './check-for-updates'

0 commit comments

Comments
 (0)