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
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@t3tools/monorepo",
"name": "@liteeditor/monorepo",
"private": true,
"workspaces": {
"packages": [
Expand All @@ -24,19 +24,19 @@
"scripts": {
"dev": "node scripts/dev-runner.ts dev:desktop",
"dev:desktop": "node scripts/dev-runner.ts dev:desktop",
"start": "turbo run start --filter=t3",
"start:desktop": "turbo run start --filter=@t3tools/desktop",
"start:marketing": "turbo run preview --filter=@t3tools/marketing",
"start": "turbo run start --filter=liteeditor-server",
"start:desktop": "turbo run start --filter=@liteeditor/desktop",
"start:marketing": "turbo run preview --filter=@liteeditor/marketing",
"build": "turbo run build",
"build:marketing": "turbo run build --filter=@t3tools/marketing",
"build:desktop": "turbo run build --filter=@t3tools/desktop --filter=t3",
"build:marketing": "turbo run build --filter=@liteeditor/marketing",
"build:desktop": "turbo run build --filter=@liteeditor/desktop --filter=liteeditor-server",
"typecheck": "turbo run typecheck",
"lint": "oxlint --report-unused-disable-directives",
"test": "turbo run test",
"test:desktop-smoke": "turbo run smoke-test --filter=@t3tools/desktop",
"test:desktop-smoke": "turbo run smoke-test --filter=@liteeditor/desktop",
"fmt": "oxfmt",
"fmt:check": "oxfmt --check",
"build:contracts": "turbo run build --filter=@t3tools/contracts",
"build:contracts": "turbo run build --filter=@liteeditor/contracts",
"dist:desktop:artifact": "node scripts/build-desktop-artifact.ts",
"dist:desktop:dmg": "node scripts/build-desktop-artifact.ts --platform mac --target dmg",
"dist:desktop:dmg:arm64": "node scripts/build-desktop-artifact.ts --platform mac --target dmg --arch arm64",
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@t3tools/contracts",
"name": "@liteeditor/contracts",
"version": "0.0.13",
"private": true,
"files": [
Expand Down
4 changes: 2 additions & 2 deletions packages/contracts/src/terminal.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@ describe("TerminalOpenInput", () => {
cols: 100,
rows: 24,
env: {
T3CODE_PROJECT_ROOT: "/tmp/project",
LITEEDITOR_PROJECT_ROOT: "/tmp/project",
CUSTOM_FLAG: "1",
},
});
expect(parsed.env).toMatchObject({
T3CODE_PROJECT_ROOT: "/tmp/project",
LITEEDITOR_PROJECT_ROOT: "/tmp/project",
CUSTOM_FLAG: "1",
});
});
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@t3tools/shared",
"name": "@liteeditor/shared",
"version": "0.0.0-alpha.1",
"private": true,
"type": "module",
Expand Down Expand Up @@ -39,7 +39,7 @@
"test": "vitest run"
},
"dependencies": {
"@t3tools/contracts": "workspace:*",
"@liteeditor/contracts": "workspace:*",
"effect": "catalog:"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/Net.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export interface NetServiceShape {
* NetService - Service tag for startup networking helpers.
*/
export class NetService extends ServiceMap.Service<NetService, NetServiceShape>()(
"@t3tools/shared/Net/NetService",
"@liteeditor/shared/Net/NetService",
) {
static readonly layer = Layer.sync(NetService, () => {
/**
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/model.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
MODEL_OPTIONS,
MODEL_OPTIONS_BY_PROVIDER,
REASONING_EFFORT_OPTIONS_BY_PROVIDER,
} from "@t3tools/contracts";
} from "@liteeditor/contracts";

import {
applyClaudePromptEffortPrefix,
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
type ModelSlug,
type ProviderReasoningEffort,
type ProviderKind,
} from "@t3tools/contracts";
} from "@liteeditor/contracts";

const MODEL_SLUG_SET_BY_PROVIDER: Record<ProviderKind, ReadonlySet<ModelSlug>> = {
claudeAgent: new Set(MODEL_OPTIONS_BY_PROVIDER.claudeAgent.map((option) => option.slug)),
Expand Down
28 changes: 14 additions & 14 deletions packages/shared/src/shell.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ describe("extractPathFromShellOutput", () => {
it("extracts the path between capture markers", () => {
expect(
extractPathFromShellOutput(
"__T3CODE_PATH_START__\n/opt/homebrew/bin:/usr/bin\n__T3CODE_PATH_END__\n",
"__LITEEDITOR_PATH_START__\n/opt/homebrew/bin:/usr/bin\n__LITEEDITOR_PATH_END__\n",
),
).toBe("/opt/homebrew/bin:/usr/bin");
});

it("ignores shell startup noise around the capture markers", () => {
expect(
extractPathFromShellOutput(
"Welcome to fish\n__T3CODE_PATH_START__\n/opt/homebrew/bin:/usr/bin\n__T3CODE_PATH_END__\nBye\n",
"Welcome to fish\n__LITEEDITOR_PATH_START__\n/opt/homebrew/bin:/usr/bin\n__LITEEDITOR_PATH_END__\nBye\n",
),
).toBe("/opt/homebrew/bin:/usr/bin");
});
Expand All @@ -36,7 +36,7 @@ describe("readPathFromLoginShell", () => {
args: ReadonlyArray<string>,
options: { encoding: "utf8"; timeout: number },
) => string
>(() => "__T3CODE_ENV_PATH_START__\n/a:/b\n__T3CODE_ENV_PATH_END__\n");
>(() => "__LITEEDITOR_ENV_PATH_START__\n/a:/b\n__LITEEDITOR_ENV_PATH_END__\n");

expect(readPathFromLoginShell("/opt/homebrew/bin/fish", execFile)).toBe("/a:/b");
expect(execFile).toHaveBeenCalledTimes(1);
Expand All @@ -54,8 +54,8 @@ describe("readPathFromLoginShell", () => {
expect(args).toHaveLength(2);
expect(args?.[0]).toBe("-ilc");
expect(args?.[1]).toContain("printenv PATH || true");
expect(args?.[1]).toContain("__T3CODE_ENV_PATH_START__");
expect(args?.[1]).toContain("__T3CODE_ENV_PATH_END__");
expect(args?.[1]).toContain("__LITEEDITOR_ENV_PATH_START__");
expect(args?.[1]).toContain("__LITEEDITOR_ENV_PATH_END__");
expect(options).toEqual({ encoding: "utf8", timeout: 5000 });
});
});
Expand All @@ -70,12 +70,12 @@ describe("readEnvironmentFromLoginShell", () => {
) => string
>(() =>
[
"__T3CODE_ENV_PATH_START__",
"__LITEEDITOR_ENV_PATH_START__",
"/a:/b",
"__T3CODE_ENV_PATH_END__",
"__T3CODE_ENV_SSH_AUTH_SOCK_START__",
"__LITEEDITOR_ENV_PATH_END__",
"__LITEEDITOR_ENV_SSH_AUTH_SOCK_START__",
"/tmp/secretive.sock",
"__T3CODE_ENV_SSH_AUTH_SOCK_END__",
"__LITEEDITOR_ENV_SSH_AUTH_SOCK_END__",
].join("\n"),
);

Expand All @@ -95,11 +95,11 @@ describe("readEnvironmentFromLoginShell", () => {
) => string
>(() =>
[
"__T3CODE_ENV_PATH_START__",
"__LITEEDITOR_ENV_PATH_START__",
"/a:/b",
"__T3CODE_ENV_PATH_END__",
"__T3CODE_ENV_SSH_AUTH_SOCK_START__",
"__T3CODE_ENV_SSH_AUTH_SOCK_END__",
"__LITEEDITOR_ENV_PATH_END__",
"__LITEEDITOR_ENV_SSH_AUTH_SOCK_START__",
"__LITEEDITOR_ENV_SSH_AUTH_SOCK_END__",
].join("\n"),
);

Expand All @@ -116,7 +116,7 @@ describe("readEnvironmentFromLoginShell", () => {
options: { encoding: "utf8"; timeout: number },
) => string
>(() =>
["__T3CODE_ENV_CUSTOM_VAR_START__", " padded value ", "__T3CODE_ENV_CUSTOM_VAR_END__"].join(
["__LITEEDITOR_ENV_CUSTOM_VAR_START__", " padded value ", "__LITEEDITOR_ENV_CUSTOM_VAR_END__"].join(
"\n",
),
);
Expand Down
8 changes: 4 additions & 4 deletions packages/shared/src/shell.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { execFileSync } from "node:child_process";

const PATH_CAPTURE_START = "__T3CODE_PATH_START__";
const PATH_CAPTURE_END = "__T3CODE_PATH_END__";
const PATH_CAPTURE_START = "__LITEEDITOR_PATH_START__";
const PATH_CAPTURE_END = "__LITEEDITOR_PATH_END__";
const SHELL_ENV_NAME_PATTERN = /^[A-Z0-9_]+$/;

type ExecFileSyncLike = (
Expand Down Expand Up @@ -30,11 +30,11 @@ export function readPathFromLoginShell(
}

function envCaptureStart(name: string): string {
return `__T3CODE_ENV_${name}_START__`;
return `__LITEEDITOR_ENV_${name}_START__`;
}

function envCaptureEnd(name: string): string {
return `__T3CODE_ENV_${name}_END__`;
return `__LITEEDITOR_ENV_${name}_END__`;
}

function buildEnvironmentCaptureCommand(names: ReadonlyArray<string>): string {
Expand Down
16 changes: 8 additions & 8 deletions turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@
"VITE_WS_URL",
"VITE_DEV_SERVER_URL",
"ELECTRON_RENDERER_PORT",
"T3CODE_LOG_WS_EVENTS",
"T3CODE_MODE",
"T3CODE_PORT",
"T3CODE_NO_BROWSER",
"T3CODE_HOME",
"T3CODE_AUTH_TOKEN",
"T3CODE_DESKTOP_WS_URL"
"LITEEDITOR_LOG_WS_EVENTS",
"LITEEDITOR_MODE",
"LITEEDITOR_PORT",
"LITEEDITOR_NO_BROWSER",
"LITEEDITOR_HOME",
"LITEEDITOR_AUTH_TOKEN",
"LITEEDITOR_DESKTOP_WS_URL"
],
"tasks": {
"build": {
"dependsOn": ["^build"],
"outputs": ["dist/**", "dist-electron/**"]
},
"dev": {
"dependsOn": ["@t3tools/contracts#build"],
"dependsOn": ["@liteeditor/contracts#build"],
"cache": false,
"persistent": true
},
Expand Down
Loading