From 9382de7eba1d5be8a62cb48eae688760738be73e Mon Sep 17 00:00:00 2001
From: Hari <73809867+harivansh-afk@users.noreply.github.com>
Date: Wed, 8 Apr 2026 18:19:41 -0400
Subject: [PATCH] feat: update pure prompt zsh naming nad other guest os files
 (#6)

---
 internal/daemon/create.go            |  3 +++
 internal/daemon/daemon_test.go       | 14 +++++++++++
 internal/daemon/files.go             | 35 +++++++++++++++++++++++++++
 internal/daemon/guest_config_test.go | 36 ++++++++++++++++++++++++++++
 4 files changed, 88 insertions(+)

diff --git a/internal/daemon/create.go b/internal/daemon/create.go
index 9aaeeaa..2a5b537 100644
--- a/internal/daemon/create.go
+++ b/internal/daemon/create.go
@@ -80,6 +80,9 @@ func (d *Daemon) CreateMachine(ctx context.Context, req contracthost.CreateMachi
 	if err := injectGuestConfig(ctx, systemVolumePath, guestConfig); err != nil {
 		return nil, err
 	}
+	if err := injectMachineIdentity(ctx, systemVolumePath, req.MachineID); err != nil {
+		return nil, err
+	}
 
 	spec, err := d.buildMachineSpec(req.MachineID, artifact, userVolumes, systemVolumePath)
 	if err != nil {
diff --git a/internal/daemon/daemon_test.go b/internal/daemon/daemon_test.go
index 384f149..7d60f36 100644
--- a/internal/daemon/daemon_test.go
+++ b/internal/daemon/daemon_test.go
@@ -153,6 +153,20 @@ func TestCreateMachineStagesArtifactsAndPersistsState(t *testing.T) {
 	if !strings.Contains(authorizedKeys, "daemon-test") {
 		t.Fatalf("authorized_keys missing request override key: %q", authorizedKeys)
 	}
+	machineName, err := readExt4File(runtime.lastSpec.RootFSPath, "/etc/microagent/machine-name")
+	if err != nil {
+		t.Fatalf("read injected machine-name: %v", err)
+	}
+	if machineName != "vm-1\n" {
+		t.Fatalf("machine-name mismatch: got %q want %q", machineName, "vm-1\n")
+	}
+	hosts, err := readExt4File(runtime.lastSpec.RootFSPath, "/etc/hosts")
+	if err != nil {
+		t.Fatalf("read injected hosts: %v", err)
+	}
+	if !strings.Contains(hosts, "127.0.1.1 vm-1") {
+		t.Fatalf("hosts missing machine identity: %q", hosts)
+	}
 
 	artifact, err := fileStore.GetArtifact(context.Background(), response.Machine.Artifact)
 	if err != nil {
diff --git a/internal/daemon/files.go b/internal/daemon/files.go
index 1d3f164..472363b 100644
--- a/internal/daemon/files.go
+++ b/internal/daemon/files.go
@@ -296,6 +296,41 @@ func injectGuestConfig(ctx context.Context, imagePath string, config *contractho
 	return nil
 }
 
+func injectMachineIdentity(ctx context.Context, imagePath string, machineID contracthost.MachineID) error {
+	machineName := strings.TrimSpace(string(machineID))
+	if machineName == "" {
+		return fmt.Errorf("machine_id is required")
+	}
+
+	stagingDir, err := os.MkdirTemp(filepath.Dir(imagePath), "machine-identity-*")
+	if err != nil {
+		return fmt.Errorf("create machine identity staging dir: %w", err)
+	}
+	defer os.RemoveAll(stagingDir)
+
+	identityFiles := map[string]string{
+		"/etc/microagent/machine-name": machineName + "\n",
+		"/etc/hostname":                machineName + "\n",
+		"/etc/hosts": fmt.Sprintf(
+			"127.0.0.1 localhost\n127.0.1.1 %s\n::1 localhost ip6-localhost ip6-loopback\nff02::1 ip6-allnodes\nff02::2 ip6-allrouters\n",
+			machineName,
+		),
+	}
+
+	for targetPath, payload := range identityFiles {
+		sourceName := strings.TrimPrefix(strings.ReplaceAll(targetPath, "/", "_"), "_")
+		sourcePath := filepath.Join(stagingDir, sourceName)
+		if err := os.WriteFile(sourcePath, []byte(payload), 0o644); err != nil {
+			return fmt.Errorf("write machine identity staging file for %q: %w", targetPath, err)
+		}
+		if err := replaceExt4File(ctx, imagePath, sourcePath, targetPath); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 func replaceExt4File(ctx context.Context, imagePath string, sourcePath string, targetPath string) error {
 	_ = runDebugFS(ctx, imagePath, fmt.Sprintf("rm %s", targetPath))
 	if err := runDebugFS(ctx, imagePath, fmt.Sprintf("write %s %s", sourcePath, targetPath)); err != nil {
diff --git a/internal/daemon/guest_config_test.go b/internal/daemon/guest_config_test.go
index 1af1fdc..08d9796 100644
--- a/internal/daemon/guest_config_test.go
+++ b/internal/daemon/guest_config_test.go
@@ -58,6 +58,42 @@ func TestInjectGuestConfigWritesAuthorizedKeysAndWebhook(t *testing.T) {
 	}
 }
 
+func TestInjectMachineIdentityWritesHostnameFiles(t *testing.T) {
+	root := t.TempDir()
+	imagePath := filepath.Join(root, "rootfs.ext4")
+	if err := buildTestExt4Image(root, imagePath); err != nil {
+		t.Fatalf("build ext4 image: %v", err)
+	}
+
+	if err := injectMachineIdentity(context.Background(), imagePath, "kiruru"); err != nil {
+		t.Fatalf("inject machine identity: %v", err)
+	}
+
+	machineName, err := readExt4File(imagePath, "/etc/microagent/machine-name")
+	if err != nil {
+		t.Fatalf("read machine-name: %v", err)
+	}
+	if machineName != "kiruru\n" {
+		t.Fatalf("machine-name mismatch: got %q want %q", machineName, "kiruru\n")
+	}
+
+	hostname, err := readExt4File(imagePath, "/etc/hostname")
+	if err != nil {
+		t.Fatalf("read hostname: %v", err)
+	}
+	if hostname != "kiruru\n" {
+		t.Fatalf("hostname mismatch: got %q want %q", hostname, "kiruru\n")
+	}
+
+	hosts, err := readExt4File(imagePath, "/etc/hosts")
+	if err != nil {
+		t.Fatalf("read hosts: %v", err)
+	}
+	if !strings.Contains(hosts, "127.0.1.1 kiruru") {
+		t.Fatalf("hosts missing machine name: %q", hosts)
+	}
+}
+
 func buildTestExt4Image(root string, imagePath string) error {
 	sourceDir := filepath.Join(root, "source")
 	if err := os.MkdirAll(filepath.Join(sourceDir, "etc", "microagent"), 0o755); err != nil {