code-ollama 0.14.0 → 0.14.1

package/dist/assets/{tui-TX7C0xYg.js → tui-CoX71F7Y.js}

@@ -65,7 +65,7 @@ var CodeBlock = memo(function CodeBlock({ code, language, role }) {
 	const isSystem = role === SYSTEM;
 	return /* @__PURE__ */ jsx(Box, {
 		flexDirection: "column",
-		borderStyle: "round",
+		borderStyle: "bold",
 		borderColor: isSystem ? "gray" : "dim",
 		paddingX: 1,
 		marginY: 1,
@@ -308,11 +308,12 @@ function Messages({ messages, isLoading, sessionId = 0, streamingMessage }) {
 }
 //#endregion
 //#region src/components/SelectPrompt.tsx
-function SelectPrompt({ children, onCancel, ...selectProps }) {
+function SelectPrompt({ borderStyle, children, onCancel, ...selectProps }) {
 	useInput((input, key) => {
 		if (key.escape || key.ctrl && input === "c") onCancel?.();
 	});
 	return /* @__PURE__ */ jsxs(Box, {
+		borderStyle,
 		flexDirection: "column",
 		children: [children, /* @__PURE__ */ jsx(Select, { ...selectProps })]
 	});
@@ -373,29 +374,32 @@ var options$1 = [
 	}
 ];
 function PlanApproval({ planContent, onModeChange }) {
-	return /* @__PURE__ */ jsx(SelectPrompt, {
-		options: options$1,
-		onChange: useCallback((value) => {
-			onModeChange(value);
-		}, [onModeChange]),
-		onCancel: useCallback(() => {
-			onModeChange(PLAN);
-		}, [onModeChange]),
-		children: /* @__PURE__ */ jsxs(Box, {
-			flexDirection: "column",
-			marginTop: 1,
-			children: [
-				/* @__PURE__ */ jsx(Text, {
-					bold: true,
-					color: "magenta",
-					children: "Plan Generated - Choose execution mode:"
-				}),
-				/* @__PURE__ */ jsx(Box, {
-					marginY: 1,
-					children: /* @__PURE__ */ jsx(Text, { children: planContent })
-				}),
-				/* @__PURE__ */ jsx(SelectPromptHint, { message: "Select execution mode" })
-			]
+	return /* @__PURE__ */ jsx(Box, {
+		marginX: 2,
+		children: /* @__PURE__ */ jsx(SelectPrompt, {
+			borderStyle: "bold",
+			options: options$1,
+			onChange: useCallback((value) => {
+				onModeChange(value);
+			}, [onModeChange]),
+			onCancel: useCallback(() => {
+				onModeChange(PLAN);
+			}, [onModeChange]),
+			children: /* @__PURE__ */ jsxs(Box, {
+				flexDirection: "column",
+				children: [
+					/* @__PURE__ */ jsx(Text, {
+						bold: true,
+						color: "magenta",
+						children: "Plan Generated - Choose execution mode:"
+					}),
+					/* @__PURE__ */ jsx(Box, {
+						marginY: 1,
+						children: /* @__PURE__ */ jsx(Text, { children: planContent })
+					}),
+					/* @__PURE__ */ jsx(SelectPromptHint, { message: "Select execution mode" })
+				]
+			})
 		})
 	});
 }
@@ -416,47 +420,51 @@ function ToolApproval({ toolCall, onDecision }) {
 		onDecision(REJECT);
 	}, [onDecision]);
 	const args = JSON.stringify(toolCall.function.arguments, null, 2);
-	return /* @__PURE__ */ jsxs(SelectPrompt, {
-		options,
-		onChange: handleChange,
-		onCancel: handleEscape,
-		children: [
-			/* @__PURE__ */ jsx(Text, {
-				color: "yellow",
-				children: "⚠️ Tool requires approval:"
-			}),
-			/* @__PURE__ */ jsxs(Box, {
-				marginX: 3,
-				marginBottom: 1,
-				flexDirection: "column",
-				children: [/* @__PURE__ */ jsxs(Text, { children: [
-					/* @__PURE__ */ jsx(Text, {
-						italic: true,
-						children: "Tool:"
-					}),
-					" ",
-					toolCall.function.name
-				] }), /* @__PURE__ */ jsxs(Text, { children: [
-					/* @__PURE__ */ jsx(Text, {
-						italic: true,
-						children: "Arguments:"
-					}),
-					" ",
-					args
-				] })]
-			}),
-			/* @__PURE__ */ jsx(SelectPromptHint, {
-				message: "Select approval action",
-				escapeLabel: "reject"
-			})
-		]
+	return /* @__PURE__ */ jsx(Box, {
+		marginX: 2,
+		children: /* @__PURE__ */ jsxs(SelectPrompt, {
+			borderStyle: "bold",
+			options,
+			onChange: handleChange,
+			onCancel: handleEscape,
+			children: [
+				/* @__PURE__ */ jsx(Text, {
+					color: "yellow",
+					children: "Tool requires approval ⚠️ "
+				}),
+				/* @__PURE__ */ jsxs(Box, {
+					flexDirection: "column",
+					marginBottom: 1,
+					marginX: 2,
+					children: [/* @__PURE__ */ jsxs(Text, { children: [
+						/* @__PURE__ */ jsx(Text, {
+							dimColor: true,
+							children: "Tool:"
+						}),
+						" ",
+						toolCall.function.name
+					] }), /* @__PURE__ */ jsxs(Text, { children: [
+						/* @__PURE__ */ jsx(Text, {
+							dimColor: true,
+							children: "Arguments:"
+						}),
+						" ",
+						args
+					] })]
+				}),
+				/* @__PURE__ */ jsx(SelectPromptHint, {
+					message: "Select approval action",
+					escapeLabel: "reject"
+				})
+			]
+		})
 	});
 }
 //#endregion
 //#region src/components/Chat/constants.ts
 var ACTION_NOT_PERFORMED = "The requested action was NOT performed";
 var PLAN_CHECKLIST_REMINDER = "Then display the execution plan as an unchecked Markdown checklist only";
-var PLAN_EXECUTION_REMINDER = "Do not claim success and do not call write_file or run_shell until the user approves execution";
+var PLAN_EXECUTION_REMINDER = `Do not claim success and do not call ${Array.from(WRITE_TOOLS).join(", ")} until the user approves execution`;
 var INTERRUPT_REASON = /* @__PURE__ */ function(INTERRUPT_REASON) {
 	INTERRUPT_REASON["INTERRUPTED"] = "interrupted";
 	INTERRUPT_REASON["REJECTED"] = "rejected";
@@ -464,7 +472,39 @@ var INTERRUPT_REASON = /* @__PURE__ */ function(INTERRUPT_REASON) {
 }({});
 //#endregion
 //#region src/components/TextInput/TextInput.tsx
-function TextInput({ value, isDisabled = false, placeholder, cursorPosition: externalCursorPosition, onChange, onSubmit }) {
+function buildLineSegments(displayValue, cursorPosition, width) {
+	const safeWidth = Math.max(1, width);
+	const cursorChar = displayValue[cursorPosition] || " ";
+	const renderValue = displayValue.slice(0, cursorPosition) + cursorChar + displayValue.slice(cursorPosition + 1);
+	const totalLength = Math.max(1, renderValue.length);
+	const lines = [];
+	for (let start = 0; start < totalLength; start += safeWidth) {
+		const end = start + safeWidth;
+		const text = renderValue.slice(start, end);
+		const hasCursor = cursorPosition >= start && cursorPosition < end;
+		if (!hasCursor) {
+			lines.push({
+				text,
+				hasCursor,
+				beforeCursor: "",
+				cursorChar: " ",
+				afterCursor: ""
+			});
+			continue;
+		}
+		const offset = cursorPosition - start;
+		lines.push({
+			text,
+			hasCursor,
+			beforeCursor: text.slice(0, offset),
+			cursorChar: text[offset] || " ",
+			afterCursor: text.slice(offset + 1)
+		});
+	}
+	return lines;
+}
+function TextInput({ value, isDisabled = false, placeholder, cursorPosition: externalCursorPosition, wrapIndent = 0, onChange, onSubmit }) {
+	const { stdout } = useStdout();
 	const [cursorPosition, setCursorPosition] = useState(value.length);
 	const prevValueRef = useRef(value);
 	const prevExternalCursorRef = useRef(externalCursorPosition);
@@ -522,6 +562,14 @@ function TextInput({ value, isDisabled = false, placeholder, cursorPosition: ext
 			setCursorPosition(value.length);
 			return;
 		}
+		if (key.ctrl && input === "a") {
+			setCursorPosition(0);
+			return;
+		}
+		if (key.ctrl && input === "e") {
+			setCursorPosition(value.length);
+			return;
+		}
 		// v8 ignore start
 		if (input) {
 			onChange(value.slice(0, cursorPosition) + input + value.slice(cursorPosition));
@@ -531,23 +579,31 @@ function TextInput({ value, isDisabled = false, placeholder, cursorPosition: ext
 	}, { isActive: !isDisabled });
 	const displayValue = value || (placeholder ?? "");
 	const isPlaceholder = Boolean(!value && placeholder);
-	const cursorChar = displayValue[cursorPosition] || " ";
-	const before = displayValue.slice(0, cursorPosition);
-	const after = displayValue.slice(cursorPosition + 1);
-	return /* @__PURE__ */ jsxs(Fragment, { children: [
-		/* @__PURE__ */ jsx(Text, {
-			dimColor: isPlaceholder,
-			children: before
-		}),
-		/* @__PURE__ */ jsx(Text, {
-			inverse: true,
-			children: cursorChar
-		}),
-		/* @__PURE__ */ jsx(Text, {
+	const availableWidth = Math.max(1, stdout.columns - wrapIndent);
+	return /* @__PURE__ */ jsx(Box, {
+		flexDirection: "column",
+		children: useMemo(() => buildLineSegments(displayValue, cursorPosition, availableWidth), [
+			availableWidth,
+			cursorPosition,
+			displayValue
+		]).map((line, index) => /* @__PURE__ */ jsx(Text, { children: line.hasCursor ? /* @__PURE__ */ jsxs(Fragment, { children: [
+			/* @__PURE__ */ jsx(Text, {
+				dimColor: isPlaceholder,
+				children: line.beforeCursor
+			}),
+			/* @__PURE__ */ jsx(Text, {
+				inverse: true,
+				children: line.cursorChar
+			}),
+			/* @__PURE__ */ jsx(Text, {
+				dimColor: isPlaceholder,
+				children: line.afterCursor
+			})
+		] }) : /* @__PURE__ */ jsx(Text, {
 			dimColor: isPlaceholder,
-			children: after
-		})
-	] });
+			children: line.text
+		}) }, `${String(index)}-${line.text}`))
+	});
 }
 //#endregion
 //#region src/components/Chat/CommandMenu.tsx
@@ -789,6 +845,7 @@ function Input({ isDisabled = false, onInterrupt, onSubmit }) {
 				value: input,
 				isDisabled,
 				cursorPosition,
+				wrapIndent: 2,
 				onChange: setInput,
 				onSubmit: handleSubmitText,
 				placeholder: "Ask anything... (/ commands, @ files)"
@@ -1228,7 +1285,7 @@ function Header({ model, onLoad }) {
 	return /* @__PURE__ */ jsx(Static, {
 		items: [0],
 		children: (key) => /* @__PURE__ */ jsxs(Box, {
-			borderStyle: "round",
+			borderStyle: "bold",
 			flexDirection: "column",
 			paddingX: 1,
 			children: [
@@ -1394,6 +1451,7 @@ function SearchSettings({ currentUrl, onClose, onSave }) {
 			/* @__PURE__ */ jsx(Text, { children: "Set the SearXNG base URL. DuckDuckGo remains the fallback." }),
 			/* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, { children: "> " }), /* @__PURE__ */ jsx(TextInput, {
 				value: draftUrl,
+				wrapIndent: 2,
 				onChange: setDraftUrl,
 				onSubmit: handleSubmit,
 				placeholder: "http://localhost:8080"

package/dist/cli.js

@@ -32,7 +32,7 @@ var LIST = [
 //#endregion
 //#region package.json
 var name = "code-ollama";
-var version = "0.14.0";
+var version = "0.14.1";
 //#endregion
 //#region src/constants/package.ts
 var NAME = name;
@@ -904,7 +904,7 @@ async function main(args = process.argv.slice(2)) {
 	else await launchTui();
 }
 async function launchTui(sessionId) {
-	const { renderApp } = await import("./assets/tui-TX7C0xYg.js");
+	const { renderApp } = await import("./assets/tui-CoX71F7Y.js");
 	reset();
 	renderApp(sessionId);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-ollama",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "description": "Ollama coding agent that runs in your terminal",
   "author": "Mark <mark@remarkablemark.org> (https://remarkablemark.org)",
   "type": "module",
@@ -42,7 +42,7 @@
     "@inkjs/ui": "2.0.0",
     "@shikijs/cli": "4.0.2",
     "cac": "7.0.0",
-    "ink": "7.0.2",
+    "ink": "7.0.3",
     "marked": "15.0.12",
     "marked-terminal": "7.3.0",
     "ollama": "0.6.3",